diff --git a/ChangeLog b/ChangeLog
index 4aaea5743..507f42e78 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-19  Thomas Thurman  <tthurman@gnome.org>
+
+	* src/ui/frames.c: when the user double-clicks the title bar,
+	  end the grab op.  Closes #401028.
+
 2008-12-16  Thomas Thurman  <tthurman@gnome.org>
 
         * configure.in: Post-release bump to 2.25.89.
diff --git a/src/ui/frames.c b/src/ui/frames.c
index 093af9216..700e7471d 100644
--- a/src/ui/frames.c
+++ b/src/ui/frames.c
@@ -1388,6 +1388,7 @@ meta_frames_button_press_event (GtkWidget      *widget,
       event->button == 1 &&
       event->type == GDK_2BUTTON_PRESS)
     {
+      meta_core_end_grab_op (gdk_display, event->time);
       return meta_frame_double_click_event (frame, event);
     }