2 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index 3e509727..5032b196 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -99,6 +99,7 @@ CharSelectDialog::CharSelectDialog():
     newCharButton->addActionListener(this);
     delCharButton->addActionListener(this);
 
+    selectButton->requestFocus();
     setLocationRelativeTo(getParent());
 }
 
diff --git a/src/gui/char_server.cpp b/src/gui/char_server.cpp
index 5b3992f1..cb1d3659 100644
--- a/src/gui/char_server.cpp
+++ b/src/gui/char_server.cpp
@@ -75,6 +75,7 @@ ServerSelectDialog::ServerSelectDialog():
         serverList->setSelected(1);
     }
 
+    okButton->requestFocus();
     setLocationRelativeTo(getParent());
 }