diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/AutoCompleteTextFieldComponent.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/AutoCompleteTextFieldComponent.java
index e3d766391..9752d97c7 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/AutoCompleteTextFieldComponent.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/AutoCompleteTextFieldComponent.java
@@ -86,6 +86,7 @@ public class AutoCompleteTextFieldComponent extends HorizontalLayout {
     @PostConstruct
     public void postConstruct() {
         new TextFieldSuggestionBox(rsqlValidationOracle, this).extend(queryTextField);
+        queryTextField.addShortcutListener(new EnterShortCutListener());
     }
 
     /**