diff --git a/UnleashedRecomp/kernel/xam.cpp b/UnleashedRecomp/kernel/xam.cpp
index 6136ee8..450430b 100644
--- a/UnleashedRecomp/kernel/xam.cpp
+++ b/UnleashedRecomp/kernel/xam.cpp
@@ -406,10 +406,10 @@ SWA_API uint32_t XamInputGetState(uint32_t userIndex, uint32_t flags, XAMINPUT_S
 
     uint32_t result = hid::GetState(userIndex, state);
 
-    if (GameWindow::s_isFocused)
-    {
-        auto keyboardState = SDL_GetKeyboardState(NULL);
+    auto keyboardState = SDL_GetKeyboardState(NULL);
 
+    if (GameWindow::s_isFocused && !keyboardState[SDL_SCANCODE_LALT])
+    {
         if (keyboardState[SDL_SCANCODE_W])
             state->Gamepad.wButtons |= XAMINPUT_GAMEPAD_Y;
         if (keyboardState[SDL_SCANCODE_A])
diff --git a/UnleashedRecomp/ui/game_window.cpp b/UnleashedRecomp/ui/game_window.cpp
index 2edcefa..6677ca4 100644
--- a/UnleashedRecomp/ui/game_window.cpp
+++ b/UnleashedRecomp/ui/game_window.cpp
@@ -185,7 +185,7 @@ void GameWindow::Init(const char* sdlVideoDriver)
     {
         // Try matching the current window size with a known configuration.
         if (def->Value < 0)
-            def->Value = GameWindow::FindNearestDisplayMode();
+            def->Value = FindNearestDisplayMode();
     };
 
     Config::WindowSize.ApplyCallback = [](ConfigDef<int32_t>* def)