diff --git a/exwm-floating.el b/exwm-floating.el
index ea68cb5..af11b87 100644
--- a/exwm-floating.el
+++ b/exwm-floating.el
@@ -340,11 +340,7 @@ context of the corresponding buffer.")
             exwm--frame exwm-workspace--current))
     ;; Only show X windows in normal state.
     (unless (exwm-layout--iconic-state-p)
-      ;; Show it in the selected Emacs window but skip the mini-window.
-      (let ((window (or (minibuffer-selected-window)
-                        (frame-selected-window exwm-workspace--current))))
-        (set-window-buffer window buffer)
-        (select-window window))))
+      (pop-to-buffer-same-window buffer)))
   (with-current-buffer (exwm--id->buffer id)
     (run-hooks 'exwm-floating-exit-hook)))
 
diff --git a/exwm-manage.el b/exwm-manage.el
index 84dcf0a..36a9896 100644
--- a/exwm-manage.el
+++ b/exwm-manage.el
@@ -682,9 +682,7 @@ border-width: %d; sibling: #x%x; stack-mode: %d"
             (if (exwm-layout--iconic-state-p)
                 ;; State change: iconic => normal.
                 (when (eq exwm--frame exwm-workspace--current)
-                  (set-window-buffer (frame-selected-window exwm--frame)
-                                     (current-buffer))
-                  (select-window (frame-selected-window exwm--frame)))
+                  (pop-to-buffer-same-window (current-buffer)))
               (exwm--log "#x%x is already managed" window)))
         (if (/= exwm--root parent)
             (progn (xcb:+request exwm--connection