diff --git a/ChangeLog b/ChangeLog
index 8e842d30f0..82b40fc818 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-02-06  Cody Russell  <bratsche@gnome.org>
+
+	Merge from trunk:
+
+	* gdk/win32/gdkevents-win32.c: Check if the window is a temp window,
+	otherwise things get wonky when you click on a menu.  This fixes
+	a regression caused in #505928.  Thanks to Tor for spotting this
+	one!  (#514789)
+
 2008-02-05  Matthias Clasen  <mclasen@redhat.com>
 
 	Merge from trunk:
diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c
index 584c2145e3..c6603e6ead 100644
--- a/gdk/win32/gdkevents-win32.c
+++ b/gdk/win32/gdkevents-win32.c
@@ -2964,7 +2964,11 @@ gdk_event_translate (MSG  *msg,
 					   GDK_WINDOW_STATE_MAXIMIZED |
 					   withdrawn_bit,
 					   0);
-	      show_window_internal (window, FALSE);
+
+	      if (GDK_WINDOW_TYPE (window) != GDK_WINDOW_TEMP)
+		{
+		  show_window_internal (window, FALSE);
+		}
 	    }
 	  else if (msg->wParam == SIZE_MAXIMIZED)
 	    gdk_synthesize_window_state (window,