diff --git a/src/gui/DialogContainer.cxx b/src/gui/DialogContainer.cxx
index f3d63c227..a1935b4f0 100644
--- a/src/gui/DialogContainer.cxx
+++ b/src/gui/DialogContainer.cxx
@@ -355,11 +355,10 @@ void DialogContainer::handleJoyBtnEvent(int stick, int button, bool pressed)
       myCurrentButtonDown.stick = myCurrentButtonDown.button = -1;
       myButtonRepeatTime = myButtonLongPressTime = 0;
     }
-    if(myIgnoreButtonUp)
-      myIgnoreButtonUp = false;
-    else
+    if(!myIgnoreButtonUp)
       activeDialog->handleJoyUp(stick, button);
   }
+  myIgnoreButtonUp = false;
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -