src/cycling.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/cycling.c b/src/cycling.c
index 54ed570..e9d8b9c 100644
--- a/src/cycling.c
+++ b/src/cycling.c
@@ -203,9 +203,10 @@ StartWindozeCycle(WWindow *wwin, XEvent *event, Bool next)
             printf("Got key release\n");
 #endif
             for (i = 0; i < 8 * keymap->max_keypermod; i++) {
-                if (keymap->modifiermap[i] == ev.xkey.keycode &&
-                    wKeyBindings[WKBD_FOCUSNEXT].modifier
-                    & 1<<(i/keymap->max_keypermod)) {
+		int mask = 1<<(i/keymap->max_keypermod);
+                if (keymap->modifiermap[i] == ev.xkey.keycode
+		    && ((wKeyBindings[WKBD_FOCUSNEXT].modifier & mask)
+			|| (wKeyBindings[WKBD_FOCUSPREV].modifier & mask))) {
                     done = True;
                     break;
                 }