diff --git a/ChangeLog b/ChangeLog
index 6731e8761f..cc0c1badd8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-17  Michael Natterer  <mitch@imendio.com>
+
+	* gtk/gtkoptionmenu.c (gtk_option_menu_position): cast menu's
+	toplevel to GtkWindow when passing to gtk_window_set_type_hint().
+
 2008-06-17  Michael Natterer  <mitch@imendio.com>
 
 	* gtk/gtktestutils.c: #undef GTK_DISABLE_DEPRECATED, clean up
diff --git a/gtk/gtkoptionmenu.c b/gtk/gtkoptionmenu.c
index d36816c265..328442666d 100644
--- a/gtk/gtkoptionmenu.c
+++ b/gtk/gtkoptionmenu.c
@@ -895,7 +895,7 @@ gtk_option_menu_position (GtkMenu  *menu,
   gdk_window_get_origin (widget->window, &menu_xpos, &menu_ypos);
 
   /* set combo box type hint for menu popup */
-  gtk_window_set_type_hint (GTK_MENU (option_menu->menu)->toplevel,
+  gtk_window_set_type_hint (GTK_WINDOW (GTK_MENU (option_menu->menu)->toplevel),
 			    GDK_WINDOW_TYPE_HINT_COMBO);
 
   menu_xpos += widget->allocation.x;