diff --git a/openbox/screen.c b/openbox/screen.c
index a9efcd0e..6f711ce8 100644
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -594,8 +594,7 @@ guint screen_cycle_desktop(ObDirection dir, gboolean wrap, gboolean linear,
     if (cancel) {
         d = origd;
         goto done_cycle;
-    } else if (done) {
-        screen_set_desktop(d);
+    } else if (done && dialog) {
         goto done_cycle;
     }
     if (first) {