diff --git a/exwm-layout.el b/exwm-layout.el
index 8c86bbd..9427607 100644
--- a/exwm-layout.el
+++ b/exwm-layout.el
@@ -295,7 +295,8 @@ selected by `other-buffer'."
                          (eq frame exwm--frame)))
             (setq windows (get-buffer-window-list (current-buffer) 0))
             (if (not windows)
-                (exwm-layout--hide exwm--id)
+                (when (eq frame exwm--frame)
+                  (exwm-layout--hide exwm--id))
               (let ((window (car windows)))
                 (if (eq frame exwm--frame)
                     (when (exwm-workspace--active-p frame)