diff --git a/src/cycling.c b/src/cycling.c
index 3c788288..07289580 100644
--- a/src/cycling.c
+++ b/src/cycling.c
@@ -207,7 +207,7 @@ StartWindozeCycle(WWindow *wwin, XEvent *event, Bool next)
                 WWindow *tmp;
                 if (swpanel) {
                     tmp = wSwitchPanelHandleEvent(swpanel, &ev);
-                    if (tmp && tmp != newFocused) {
+                    if (tmp) {
                         newFocused = tmp;
                         wWindowFocus(newFocused, oldFocused);
                         oldFocused = newFocused;
diff --git a/src/switchpanel.c b/src/switchpanel.c
index 7156f781..bcf9bc18 100644
--- a/src/switchpanel.c
+++ b/src/switchpanel.c
@@ -479,7 +479,7 @@ WWindow *wSwitchPanelHandleEvent(WSwitchPanel *panel, XEvent *event)
             }
         }
 
-        if (focus >= 0) {
+        if (focus >= 0 && panel->current != focus) {
             WWindow *wwin;
             
             changeImage(panel, panel->current, 0);