diff --git a/plugins/github/src/org/jetbrains/plugins/github/authentication/ui/GithubChooseAccountDialog.kt b/plugins/github/src/org/jetbrains/plugins/github/authentication/ui/GithubChooseAccountDialog.kt
index 4e0c9f69747d..f709a1531880 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/authentication/ui/GithubChooseAccountDialog.kt
+++ b/plugins/github/src/org/jetbrains/plugins/github/authentication/ui/GithubChooseAccountDialog.kt
@@ -58,6 +58,7 @@ class GithubChooseAccountDialog(project: Project?, parentComponent: JComponent?,
     this.title = title
     setOKButtonText(okText)
     init()
+    accountsList.selectedIndex = 0
   }
 
   override fun doValidate(): ValidationInfo? {
@@ -74,4 +75,6 @@ class GithubChooseAccountDialog(project: Project?, parentComponent: JComponent?,
       .addToCenter(JBScrollPane(accountsList).apply { preferredSize = JBDimension(150, 80) })
       .apply { setDefaultCheckBox?.run(::addToBottom) }
   }
+
+  override fun getPreferredFocusedComponent() = accountsList
 }
\ No newline at end of file