diff --git a/src/app/shared/input-suggestions/input-suggestions.component.ts b/src/app/shared/input-suggestions/input-suggestions.component.ts
index 7e05dbcc8c..5b22b4ba20 100644
--- a/src/app/shared/input-suggestions/input-suggestions.component.ts
+++ b/src/app/shared/input-suggestions/input-suggestions.component.ts
@@ -165,11 +165,11 @@ export class InputSuggestionsComponent implements ControlValueAccessor, OnChange
   }
 
   /**
-   * When any key is pressed (except for the Enter button) the query input should move to the input field
+   * When any key is pressed (except for the Enter & Tab button) the query input should move to the input field
    * @param {KeyboardEvent} event The keyboard event
    */
   onKeydown(event: KeyboardEvent) {
-    if (event.key !== 'Enter') {
+    if (event.key !== 'Enter' && event.key !== 'Tab') {
       this.queryInput.nativeElement.focus();
     }
   }