diff --git a/src/main/java/com/redhat/devtools/intellij/quarkus/projectWizard/QuarkusExtensionsStep.java b/src/main/java/com/redhat/devtools/intellij/quarkus/projectWizard/QuarkusExtensionsStep.java
index 920c12405..dbcda9852 100644
--- a/src/main/java/com/redhat/devtools/intellij/quarkus/projectWizard/QuarkusExtensionsStep.java
+++ b/src/main/java/com/redhat/devtools/intellij/quarkus/projectWizard/QuarkusExtensionsStep.java
@@ -53,6 +53,7 @@ public class QuarkusExtensionsStep extends ModuleWizardStep implements Disposabl
 
     private JPanel outerPanel;
     private final WizardContext wizardContext;
+    private SearchTextField filter;
 
     private static class ExtensionsTreeCellRenderer extends CheckboxTree.CheckboxTreeCellRenderer {
 
@@ -135,7 +136,7 @@ public JComponent getComponent() {
             JLabel label1 = new JLabel("Filter extensions");
             label1.setAlignmentX(Component.LEFT_ALIGNMENT);
             panel.add(label1);
-            SearchTextField filter = new SearchTextField() {
+            filter = new SearchTextField() {
                 @Override
                 public Dimension getMaximumSize() {
                     Dimension maxSize = super.getMaximumSize();
@@ -223,6 +224,12 @@ public void valueChanged(TreeSelectionEvent e) {
         return outerPanel;
     }
 
+
+    @Override
+    public JComponent getPreferredFocusedComponent() {
+        return filter;
+    }
+
     private KeyListener onSelectedExtensionsKeyPressed(List<QuarkusCategory> categories, CheckboxTree extensionsTree, JList<QuarkusExtension> selectedExtensions) {
         return new KeyAdapter() {
             @Override
diff --git a/src/main/java/com/redhat/devtools/intellij/quarkus/projectWizard/QuarkusModuleInfoStep.java b/src/main/java/com/redhat/devtools/intellij/quarkus/projectWizard/QuarkusModuleInfoStep.java
index 3dc88df6e..5f2cafd4c 100644
--- a/src/main/java/com/redhat/devtools/intellij/quarkus/projectWizard/QuarkusModuleInfoStep.java
+++ b/src/main/java/com/redhat/devtools/intellij/quarkus/projectWizard/QuarkusModuleInfoStep.java
@@ -202,6 +202,11 @@ protected void customizeCellRenderer(@NotNull JList<? extends BuildToolDelegate>
         isInitialized = true;
     }
 
+    @Override
+    public JComponent getPreferredFocusedComponent() {
+        return toolComboBox;
+    }
+
     private Future<QuarkusExtensionsModel> loadExtensionsModel(CollectionComboBoxModel<QuarkusStream> streamModel, ProgressIndicator indicator) {
         String key = ((QuarkusStream) streamModel.getSelectedItem()).getKey();
         if (key == null) {