--- nbproject/project.xml	
+++ nbproject/project.xml	
@@ -108,6 +108,15 @@ 
                     </run-dependency>
                 </dependency>
                 <dependency>
+                    <code-name-base>org.netbeans.modules.editor.lib2</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <release-version>1</release-version>
+                        <specification-version>1.11</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
                     <code-name-base>org.netbeans.modules.lexer</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
--- src/org/netbeans/modules/db/sql/editor/ui/actions/ConnectionAction.java	
+++ src/org/netbeans/modules/db/sql/editor/ui/actions/ConnectionAction.java	
@@ -43,6 +43,8 @@ 
 
 import java.awt.BorderLayout;
 import java.awt.Component;
+import java.awt.Container;
+import java.awt.DefaultFocusTraversalPolicy;
 import java.awt.Dimension;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
@@ -63,6 +65,7 @@ 
 import org.netbeans.api.db.explorer.ConnectionListener;
 import org.netbeans.api.db.explorer.ConnectionManager;
 import org.netbeans.api.db.explorer.DatabaseConnection;
+import org.netbeans.api.editor.EditorRegistry;
 import org.netbeans.modules.db.api.sql.execute.SQLExecution;
 import org.openide.awt.Mnemonics;
 import org.openide.util.Lookup;
@@ -151,6 +154,13 @@ 
             setLayout(new BorderLayout(4, 0));
             setBorder(new EmptyBorder(0, 2, 0, 8));
             setOpaque(false);
+            setFocusTraversalPolicyProvider(true);
+            setFocusTraversalPolicy(new DefaultFocusTraversalPolicy() {
+              @Override
+              public Component getDefaultComponent(Container aContainer) {
+                 return EditorRegistry.lastFocusedComponent();
+              }
+           });
 
             combo = new JComboBox();
             combo.addItemListener(new ItemListener() {