diff --git a/src/xenia/kernel/xam/ui/create_profile_ui.cc b/src/xenia/kernel/xam/ui/create_profile_ui.cc
index ac7c35897..0429748da 100644
--- a/src/xenia/kernel/xam/ui/create_profile_ui.cc
+++ b/src/xenia/kernel/xam/ui/create_profile_ui.cc
@@ -33,9 +33,8 @@ void CreateProfileUI::OnDraw(ImGuiIO& io) {
     return;
   }
 
-  if (ImGui::IsWindowFocused(ImGuiFocusedFlags_RootAndChildWindows) &&
-      !ImGui::IsAnyItemActive() && !ImGui::IsMouseClicked(0)) {
-    ImGui::SetKeyboardFocusHere(0);
+  if (ImGui::IsWindowAppearing()) {
+    ImGui::SetKeyboardFocusHere();
   }
 
   ImGui::TextUnformatted("Gamertag:");