diff --git a/ChangeLog b/ChangeLog
index c87f25c189..935e54b6ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-06-01  Bill Skaggs  <weskaggs@primate.ucdavis.edu>
+
+	* plug-ins/common/screenshot.c: trap errors when running
+	XGrabKey, to prevent bail-out on BadAccess error as
+	reported by Jean-Luc Coulon on developers list; solution
+	suggested by Simon Budig.
+	
 2005-06-02  Raphaël Quinet  <raphael@gimp.org>
 
 	* data/images/gimp-splash.png: New splash.  A twist on the
diff --git a/plug-ins/common/screenshot.c b/plug-ins/common/screenshot.c
index f41033da9a..5d71ff5d51 100644
--- a/plug-ins/common/screenshot.c
+++ b/plug-ins/common/screenshot.c
@@ -425,8 +425,11 @@ select_window_x11 (GdkScreen *screen)
 
   if (gdk_keymap_get_entries_for_keyval (NULL, GDK_Escape, &keys, &num_keys))
     {
+      gdk_error_trap_push ();
       XGrabKey (x_dpy, keys[0].keycode, AnyModifier, x_root, False,
                 GrabModeAsync, GrabModeAsync);
+      gdk_flush ();
+      gdk_error_trap_pop ();
     }
 
   while (! cancel && ((x_win == None) || (buttons != 0)))