diff --git a/Core/Dialog/PSPOskDialog.cpp b/Core/Dialog/PSPOskDialog.cpp
index 4188b50748..c243e78a6b 100755
--- a/Core/Dialog/PSPOskDialog.cpp
+++ b/Core/Dialog/PSPOskDialog.cpp
@@ -943,7 +943,7 @@ int PSPOskDialog::Update(int animSpeed) {
 	// Windows: Fall back to the OSK/continue normally if we're in fullscreen.
 	// The dialog box doesn't work right if in fullscreen.
 	if (System_GetPropertyBool(SYSPROP_HAS_KEYBOARD)) {
-		if (g_Config.bBypassOSKWithKeyboard && !g_Config.bFullScreen)
+		if (g_Config.bBypassOSKWithKeyboard && !g_Config.UseFullScreen())
 			return NativeKeyboard();
 	}
 #endif
diff --git a/UI/EmuScreen.cpp b/UI/EmuScreen.cpp
index b2a32c45ec..385be99444 100644
--- a/UI/EmuScreen.cpp
+++ b/UI/EmuScreen.cpp
@@ -414,6 +414,9 @@ void EmuScreen::dialogFinished(const Screen *dialog, DialogResult result) {
 		System_SendMessage("event", "exitgame");
 		quit_ = false;
 	}
+	// Returning to the PauseScreen, unless we're stepping, means we should go back to controls.
+	if (Core_IsActive())
+		UI::EnableFocusMovement(false);
 	RecreateViews();
 }