diff --git a/UI/EmuScreen.cpp b/UI/EmuScreen.cpp
index 6eb0176896..57cbe66e3c 100644
--- a/UI/EmuScreen.cpp
+++ b/UI/EmuScreen.cpp
@@ -179,12 +179,16 @@ void EmuScreen::update(InputState &input) {
 	// Do this no matter the value of g_Config.bShowTouchControls, some people
 	// like to use invisible controls...
 	// Don't force on platforms that likely don't have a touchscreen, like Win32, OSX, and Linux...
-	// NOTE: Breaks both hidden and visible touch controls on Win/Lin/Mac by doing this!
-#if !defined( _WIN32) && !defined(__APPLE__) && !defined(__linux__)
-	UpdateGamepad(input);
-
-	UpdateInputState(&input);
+	// TODO: What are good ifdefs for OSX and Linux, without breaking other mobile platforms?
+#ifdef _WIN32
+	if(g_Config.bShowTouchControls) {
+#else
+	if(true) {
 #endif
+		UpdateGamepad(input);
+
+		UpdateInputState(&input);
+	}
 	// Then translate pad input into PSP pad input. Also, add in tilt.
 	static const int mapping[12][2] = {
 		{PAD_BUTTON_A, CTRL_CROSS},