diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ssh/ui/SshConnectionSettingsPanel.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ssh/ui/SshConnectionSettingsPanel.java
index 4d8261c4acd9..198fd4d9ce66 100644
--- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ssh/ui/SshConnectionSettingsPanel.java
+++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ssh/ui/SshConnectionSettingsPanel.java
@@ -37,7 +37,8 @@ public class SshConnectionSettingsPanel {
     myPathToPrivateKeyFile.addBrowseFolderListener(CvsBundle.message("dialog.title.path.to.private.key.file"),
                                                    CvsBundle.message("dialog.description.path.to.private.key.file"),
                                                    null, FileChooserDescriptorFactory.createSingleFileNoJarsDescriptor());
-    ActionListener actionListener = new ActionListener() {
+    final ActionListener actionListener = new ActionListener() {
+      @Override
       public void actionPerformed(ActionEvent e) {
         setPathToPPKEnabled();
       }
@@ -61,6 +62,8 @@ public class SshConnectionSettingsPanel {
     }
     else {
       myPathToPrivateKeyFile.setEnabled(true);
+      myPathToPrivateKeyFile.getTextField().selectAll();
+      myPathToPrivateKeyFile.getTextField().requestFocus();
     }
   }