Index: src/display.c
===================================================================
RCS file: /cvs/gnome/metacity/src/display.c,v
retrieving revision 1.241
diff -p -u -r1.241 display.c
--- src/display.c	23 Dec 2004 06:44:56 -0000	1.241
+++ src/display.c	27 Dec 2004 23:33:52 -0000
@@ -1909,7 +1909,8 @@ event_callback (XEvent   *event,
       if (window)
         {
           if (display->grab_op != META_GRAB_OP_NONE &&
-              display->grab_window == window)
+              display->grab_window == window &&
+              !window->frame->mapped)
             meta_display_end_grab_op (display, CurrentTime);      
       
           if (!frame_was_receiver)
