diff --git a/openbox/focus.c b/openbox/focus.c
index 7a2d079e..4fa123cb 100644
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -271,6 +271,8 @@ Client *focus_cycle(gboolean forward, gboolean linear, gboolean done,
         if (focus_cycle_target) {
             if (focus_cycle_target->iconic)
                 client_iconify(focus_cycle_target, FALSE, FALSE);
+            if (focus_cycle_target->shaded)
+                client_shade(focus_cycle_target, FALSE);
             client_focus(focus_cycle_target);
             stacking_raise(focus_cycle_target);
         }