diff --git a/desktop/src/main/java/bisq/desktop/components/AutocompleteComboBox.java b/desktop/src/main/java/bisq/desktop/components/AutocompleteComboBox.java
index 2d8be1e561..1127862f2b 100644
--- a/desktop/src/main/java/bisq/desktop/components/AutocompleteComboBox.java
+++ b/desktop/src/main/java/bisq/desktop/components/AutocompleteComboBox.java
@@ -92,12 +92,15 @@ public class AutocompleteComboBox<T> extends JFXComboBox<T> {
             var inputTextItem = getConverter().fromString(inputText);
             if (selectedItem != null && selectedItem.equals(inputTextItem)) {
                 eh.handle(e);
+                getParent().requestFocus();
                 return;
             }
 
             // Case 2: fire if the text is empty to support special "show all" case
-            if (inputText.isEmpty())
+            if (inputText.isEmpty()) {
                 eh.handle(e);
+                getParent().requestFocus();
+            }
         });
     }