diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c
index 222432025a..767fd1cdec 100644
--- a/gdk/x11/gdkdnd-x11.c
+++ b/gdk/x11/gdkdnd-x11.c
@@ -2690,7 +2690,7 @@ drag_context_grab (GdkDragContext *context)
 
   g_set_object (&x11_context->grab_seat, seat);
 
-  gdk_error_trap_push ();
+  gdk_x11_display_error_trap_push (context->display);
 
   for (i = 0; i < G_N_ELEMENTS (grab_keys); ++i)
     {
@@ -2742,6 +2742,8 @@ drag_context_grab (GdkDragContext *context)
         }
     }
 
+  gdk_x11_display_error_trap_pop_ignored (context->display);
+
   return TRUE;
 }