diff --git a/ChangeLog b/ChangeLog
index aef0eafec..0b5b923e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-12-28  Elijah Newren  <newren@gmail.com>
+
+	Allow users to move the window around immediately after
+	double-clicking to shade (#90290)
+
+	* src/display.c (event_callback): only end the grab op if either
+	there is no frame or else the frame is not mapped
+
 2004-12-27  Elijah Newren  <newren@gmail.com>
 
 	Focus windows that manually position themselves too (fixes
diff --git a/src/display.c b/src/display.c
index 4730b0a12..fa57f034d 100644
--- a/src/display.c
+++ b/src/display.c
@@ -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 == NULL) || !window->frame->mapped))
             meta_display_end_grab_op (display, CurrentTime);      
       
           if (!frame_was_receiver)