diff --git a/switch/source/KeyboardManager.cpp b/switch/source/KeyboardManager.cpp
index d176757..83b7a4b 100644
--- a/switch/source/KeyboardManager.cpp
+++ b/switch/source/KeyboardManager.cpp
@@ -226,10 +226,10 @@ KeyboardManager::KeyboardManager(void)
     );
     buttons.push_back(spacebar);
 
-    // set first button as selected
-    buttons.at(0)->selected(true);
-    buttons.at(0)->invertColors();
-    prevSelectedButtonIndex = 0;
+    // set OK button as selected
+    buttons.at(INDEX_OK)->selected(true);
+    buttons.at(INDEX_OK)->invertColors();
+    prevSelectedButtonIndex = INDEX_OK;
 }
 
 KeyboardManager::~KeyboardManager(void)
@@ -362,4 +362,4 @@ std::pair<bool, std::string> KeyboardManager::keyboard(const std::string& sugges
     }
 
     return std::make_pair(false, suggestion);
-}
\ No newline at end of file
+}