diff --git a/UI/GamepadEmu.cpp b/UI/GamepadEmu.cpp
index 15f9d8a737..e6b6693a4b 100644
--- a/UI/GamepadEmu.cpp
+++ b/UI/GamepadEmu.cpp
@@ -43,14 +43,14 @@ static float g_gamepadOpacity;
 static double g_lastTouch;
 
 void GamepadUpdateOpacity(float force) {
-	if (coreState != CORE_RUNNING) {
-		g_gamepadOpacity = 0.0f;
-		return;
-	}
 	if (force >= 0.0f) {
 		g_gamepadOpacity = force;
 		return;
 	}
+	if (coreState != CORE_RUNNING) {
+		g_gamepadOpacity = 0.0f;
+		return;
+	}
 
 	float fadeAfterSeconds = g_Config.iTouchButtonHideSeconds;
 	float fadeTransitionSeconds = std::min(fadeAfterSeconds, 0.5f);