diff --git a/ChangeLog b/ChangeLog
index d5716f0d82..f7f855bb62 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-07-07  Cody Russell  <bratsche@gnome.org>
+
+	Bug 541964 – [Win32] Setting modal hint to current value might confuse the stack
+
+	* gdk/win32/gdkwindow-win32.c: Check if the value is the same as the
+	existing modal hint value before setting it.
+
 2008-07-07  Cody Russell  <bratsche@gnome.org>
 
 	Bug 540994 – [Win32] Some windows don't appear at the top when created
diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c
index b6d3e6ef46..c9e8c0060a 100644
--- a/gdk/win32/gdkwindow-win32.c
+++ b/gdk/win32/gdkwindow-win32.c
@@ -3548,6 +3548,9 @@ gdk_window_set_modal_hint (GdkWindow *window,
 
   private = (GdkWindowObject*) window;
 
+  if (modal == private->modal_hint)
+    return;
+
   private->modal_hint = modal;
 
 #if 0