diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c
index 96190601d..1a9878dda 100644
--- a/xkb/xkbActions.c
+++ b/xkb/xkbActions.c
@@ -639,6 +639,7 @@ _XkbFilterPointerBtn(XkbSrvInfoPtr xkbi,
         }
             break;
         }
+        return 0;
     }
     else if (filter->keycode == keycode) {
         int button = filter->upAction.btn.button;
@@ -664,8 +665,9 @@ _XkbFilterPointerBtn(XkbSrvInfoPtr xkbi,
             break;
         }
         filter->active = 0;
+        return 0;
     }
-    return 0;
+    return 1;
 }
 
 static int