1 files changed, 2 insertions, 3 deletions
diff --git a/openbox/focus.c b/openbox/focus.c
index a4629157..127a3399 100644
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -134,8 +134,7 @@ void focus_fallback(gboolean switching_desks)
                 if (client_focus(it->data))
                     break;
             }
+        if (it == NULL) /* nothing to focus */
+            focus_set_client(NULL);
     }
-
-    if (it == NULL) /* nothing to focus */
-        focus_set_client(NULL);
 }