diff --git a/Source/miniwin/misc_msg.cpp b/Source/miniwin/misc_msg.cpp
index 0e0de355f..7db9000e1 100644
--- a/Source/miniwin/misc_msg.cpp
+++ b/Source/miniwin/misc_msg.cpp
@@ -467,7 +467,7 @@ bool FetchMessage_Real(tagMSG *lpMsg)
 	}
 
 	if (IsAnyOf(ctrlEvent.button, ControllerButtonPrimary, ControllerButtonSecondary, ControllerButtonTertiary) && IsAnyOf(ControllerButtonHeld, ctrlEvent.button, ControllerButton_NONE)) {
-		ControllerButtonHeld = ctrlEvent.up ? ControllerButton_NONE : ctrlEvent.button;
+		ControllerButtonHeld = (ctrlEvent.up || IsControllerButtonPressed(ControllerButton_BUTTON_BACK)) ? ControllerButton_NONE : ctrlEvent.button;
 		LastMouseButtonAction = MouseActionType::None;
 	}