Index: apps/action.c
===================================================================
--- apps/action.c	(revision 24174)
+++ apps/action.c	(working copy)
@@ -201,15 +201,11 @@
             pcmbuf_beep(4000, KEYCLICK_DURATION, 2500*global_settings.keyclick);
 #endif
 
-    if ((context != last_context) && ((last_button & BUTTON_REL) == 0))
+    if ((context != last_context) && ((button & BUTTON_REL) == BUTTON_REL))
     {
-        if (button & BUTTON_REL)
-        {
-            last_button = button;
-            last_action = ACTION_NONE;
-        }
-        /* eat all buttons until the previous button was |BUTTON_REL
-           (also eat the |BUTTON_REL button) */
+        last_button = button;
+        last_action = ACTION_NONE;
+        /* eat the |BUTTON_REL button */
         return ACTION_NONE; /* "safest" return value */
     }
     last_context = context;