diff --git a/exwm-input.el b/exwm-input.el
index 1f8e4f4..e185b1a 100644
--- a/exwm-input.el
+++ b/exwm-input.el
@@ -380,7 +380,7 @@ It's updated in several occasions, and only used by `exwm-input--set-focus'.")
 ;;     (exwm-input--fake-key last-input-event)))
 
 (defvar exwm-input-prefix-keys
-  '(?\C-x ?\C-u ?\C-h ?\M-x ?\M-` ?\M-\S-! ?\M-\S-& ?\M-\S-:)
+  '(?\C-x ?\C-u ?\C-h ?\M-x ?\M-` ?\M-! ?\M-& ?\M-:)
   "List of prefix keys EXWM should forward to Emacs when in line-mode.")
 
 (defvar exwm-input--simulation-keys nil "Simulation keys in line-mode.")
diff --git a/exwm-workspace.el b/exwm-workspace.el
index 94d0e75..bab2612 100644
--- a/exwm-workspace.el
+++ b/exwm-workspace.el
@@ -162,21 +162,13 @@ The optional FORCE option is for internal use only "
                            :parent (frame-parameter frame 'exwm-window-id)
                            :x 0 :y 0))
           ;; Move the window itself
-          (set-window-buffer (get-buffer-window (exwm--id->buffer id))
-                             (other-buffer))
-          (xcb:+request exwm--connection
-              (make-instance 'xcb:ChangeWindowAttributes
-                             :window id :value-mask xcb:CW:EventMask
-                             :event-mask xcb:EventMask:NoEvent))
+          (bury-buffer)
+          (exwm-layout--hide id)
           (xcb:+request exwm--connection
               (make-instance 'xcb:ReparentWindow
                              :window id
                              :parent (frame-parameter frame 'exwm-window-id)
-                             :x 0 :y 0))
-          (xcb:+request exwm--connection
-              (make-instance 'xcb:ChangeWindowAttributes
-                             :window id :value-mask xcb:CW:EventMask
-                             :event-mask exwm--client-event-mask)))))
+                             :x 0 :y 0)))))
     (xcb:flush exwm--connection)
     (exwm-workspace--update-switch-history)))