diff --git a/SDL/SDLMain.cpp b/SDL/SDLMain.cpp
index cb3c51eee8..e3fb221bd6 100644
--- a/SDL/SDLMain.cpp
+++ b/SDL/SDLMain.cpp
@@ -563,9 +563,9 @@ bool System_GetPropertyBool(SystemProperty prop) {
 #if PPSSPP_PLATFORM(SWITCH)
 	case SYSPROP_HAS_TEXT_INPUT_DIALOG:
 		return __nx_applet_type == AppletType_Application || __nx_applet_type != AppletType_SystemApplication;
+#endif
 	case SYSPROP_HAS_KEYBOARD:
 		return true;
-#endif
 	case SYSPROP_APP_GOLD:
 #ifdef GOLD
 		return true;
diff --git a/UI/GameSettingsScreen.h b/UI/GameSettingsScreen.h
index f7cdbef4d6..6f956cfdb7 100644
--- a/UI/GameSettingsScreen.h
+++ b/UI/GameSettingsScreen.h
@@ -44,6 +44,7 @@ protected:
 	void dialogFinished(const Screen *dialog, DialogResult result) override;
 
 	void CreateTabs() override;
+	bool ShowSearchControls() const { return true; }
 
 private:
 	void PreCreateViews() override;