diff --git a/ChangeLog b/ChangeLog
index 5ff8edf106..dc2785b554 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-11-03  Richard Hult  <richard@imendio.com>
+
+	* gdk/quartz/GdkQuartzWindow.c:
+	* gdk/quartz/GdkQuartzWindow.h: Make the grab breaking on window
+	move work on Leopard (as well as Tiger) by ignoring which mouse
+	button is pressed.
+
 2007-11-03  Richard Hult  <richard@imendio.com>
 
 	* gdk/quartz/gdkwindow-quartz.c: (move_resize_window_internal):
diff --git a/gdk/quartz/GdkQuartzWindow.c b/gdk/quartz/GdkQuartzWindow.c
index 7200035a5f..220531604f 100644
--- a/gdk/quartz/GdkQuartzWindow.c
+++ b/gdk/quartz/GdkQuartzWindow.c
@@ -98,23 +98,17 @@
  */
 -(void)windowWillMove:(NSNotification *)aNotification
 {
-  if (leftDown)
-    inMove = YES;
+  inMove = YES;
 }
 
 -(void)sendEvent:(NSEvent *)event
 {
   switch ([event type])
     {
-    case NSLeftMouseDown:
-      leftDown = YES;
-      break;
-
     case NSLeftMouseUp:
-      leftDown = NO;
-      inMove = NO;
       inManualMove = NO;
       inManualResize = NO;
+      inMove = NO;
       break;
 
     case NSLeftMouseDragged:
@@ -143,7 +137,7 @@
   GdkEvent *event;
 
   private->x = content_rect.origin.x;
-  private->y = _gdk_quartz_window_get_inverted_screen_y (content_rect.origin.y) - impl->height;
+  private->y = _gdk_quartz_window_get_inverted_screen_y (content_rect.origin.y + content_rect.size.height);
 
   /* Synthesize a configure event */
   event = gdk_event_new (GDK_CONFIGURE);
diff --git a/gdk/quartz/GdkQuartzWindow.h b/gdk/quartz/GdkQuartzWindow.h
index f081908fd4..14c4d5a7aa 100644
--- a/gdk/quartz/GdkQuartzWindow.h
+++ b/gdk/quartz/GdkQuartzWindow.h
@@ -23,7 +23,6 @@
 #include <glib.h>
 
 @interface GdkQuartzWindow : NSWindow {
-  BOOL leftDown;
   BOOL inMove;
 
   /* Manually triggered move/resize (not by the window manager) */