diff --git a/src/cycle.c b/src/cycle.c
index e2279ffe8..fb3989df6 100644
--- a/src/cycle.c
+++ b/src/cycle.c
@@ -320,6 +320,16 @@ clientCycleEventFilter (XfwmEvent *event, gpointer data)
                     TRACE ("cycle: next");
                     c2 = tabwinSelectNext(passdata->tabwin);
                 }
+                else
+                {
+                    int keysym = XkbKeycodeToKeysym (event->meta.xevent->xany.display, event->key.keycode, 0, 0);
+
+                    if (keysym == XK_q)
+                    {
+                        clientClose (c);
+                    }
+                }
+
                 if (c2)
                 {
                     clientCycleUpdateWireframe (c2, passdata);