diff --git a/src/core/frame.c b/src/core/frame.c
index 2f9ef82cc..a61d41de2 100644
--- a/src/core/frame.c
+++ b/src/core/frame.c
@@ -143,7 +143,9 @@ meta_window_set_frame_xwindow (MetaWindow *window,
                                             x11_display->atom__NET_WM_SYNC_REQUEST_COUNTER,
                                             TRUE);
 
+  meta_x11_error_trap_push (x11_display);
   XMapWindow (x11_display->xdisplay, frame->xwindow);
+  meta_x11_error_trap_pop (x11_display);
 
   /* Move keybindings to frame instead of window */
   meta_window_grab_keys (window);