diff --git a/exwm-workspace.el b/exwm-workspace.el
index 31108892f..8a59c36b5 100644
--- a/exwm-workspace.el
+++ b/exwm-workspace.el
@@ -552,8 +552,8 @@ for internal use only."
          ((not active-old)
           (exwm-workspace--set-active frame t))
          ((equal output-old output-new)
-          (exwm-workspace--set-active old-frame nil)
           (exwm-workspace--set-active frame t)
+          (exwm-workspace--set-active old-frame nil)
           (setq workspaces-to-hide (list old-frame)))
          (active-new)
          (t