diff --git a/exwm-layout.el b/exwm-layout.el
index a03b6fb..18c2c27 100644
--- a/exwm-layout.el
+++ b/exwm-layout.el
@@ -278,7 +278,7 @@ selected by `other-buffer'."
                     (exwm-layout--hide exwm--id)))))
           ;; Other frames (e.g. terminal/graphical frame of emacsclient)
           ;; We shall bury all `exwm-mode' buffers in this case
-          (setq windows (window-list frame 0)) ;exclude minibuffer
+          (setq windows (window-list frame 'nomini))
           (let ((exwm-layout--other-buffer-exclude-exwm-mode-buffers t))
             (dolist (window windows)
               (with-current-buffer (window-buffer window)
@@ -293,7 +293,7 @@ selected by `other-buffer'."
                      (or exwm-layout-show-all-buffers
                          ;; Exclude X windows on other workspaces
                          (eq frame exwm--frame)))
-            (setq windows (get-buffer-window-list (current-buffer) 0 frame))
+            (setq windows (get-buffer-window-list (current-buffer) 'nomini frame))
             (if (not windows)
                 (when (eq frame exwm--frame)
                   (exwm-layout--hide exwm--id))
@@ -307,7 +307,7 @@ selected by `other-buffer'."
                 ;; need to display with some other buffer there.
                 (setq vacated-windows
                       (append vacated-windows (cdr (get-buffer-window-list
-                                                    (current-buffer) 0 t))))
+                                                    (current-buffer) 'nomini t))))
                 ;; Note down when an EXWM-buffer is being covered by this
                 ;; buffer; we don't want it to reappear in some vacated window.
                 (let ((prev-buffer (car-safe
@@ -323,7 +323,7 @@ selected by `other-buffer'."
           (switch-to-prev-buffer window)))
       ;; Make sure windows floating / on other workspaces are excluded
       (let ((exwm-layout--other-buffer-exclude-exwm-mode-buffers t))
-        (dolist (window (window-list frame 0))
+        (dolist (window (window-list frame 'nomini))
           (with-current-buffer (window-buffer window)
             (when (and (derived-mode-p 'exwm-mode)
                        (or exwm--floating-frame (not (eq frame exwm--frame))))