diff --git a/ChangeLog b/ChangeLog
index 9653200cd6..6efe9f47fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-14  Richard Hult  <richard@imendio.com>
+
+	* gdk/quartz/gdkwindow-quartz.c: (gdk_window_focus): Using
+	makeKeyWindow unfortunately doesn't work in all cases, we must use
+	makeKeyAndOrderFront.
+
 2008-02-14  Richard Hult  <richard@imendio.com>
 
 	* gdk/quartz/gdkwindow-quartz.c: (get_fullscreen_geometry),
diff --git a/gdk/quartz/gdkwindow-quartz.c b/gdk/quartz/gdkwindow-quartz.c
index 4682ea2880..6349ebc44f 100644
--- a/gdk/quartz/gdkwindow-quartz.c
+++ b/gdk/quartz/gdkwindow-quartz.c
@@ -2229,7 +2229,7 @@ gdk_window_focus (GdkWindow *window,
       if (private->accept_focus && private->window_type != GDK_WINDOW_TEMP) 
         {
           GDK_QUARTZ_ALLOC_POOL;
-          [impl->toplevel makeKeyWindow];
+          [impl->toplevel makeKeyAndOrderFront:impl->toplevel];
           GDK_QUARTZ_RELEASE_POOL;
         }
     }