diff --git a/panels/mouse/gnome-mouse-properties.c b/panels/mouse/gnome-mouse-properties.c
index ef61652f3..34bf5f85c 100644
--- a/panels/mouse/gnome-mouse-properties.c
+++ b/panels/mouse/gnome-mouse-properties.c
@@ -366,7 +366,7 @@ synaptics_check_capabilities (GtkBuilder *dialog)
 
 			XFree (data);
 		}
-		gdk_error_trap_pop ();
+		gdk_error_trap_pop_ignored ();
 
 		XCloseDevice (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), device);
 	}
@@ -417,7 +417,7 @@ find_synaptics (void)
 			XFree (data);
 			ret = TRUE;
 		}
-		gdk_error_trap_pop ();
+		gdk_error_trap_pop_ignored ();
 
 		XCloseDevice (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), device);