diff --git a/ChangeLog b/ChangeLog
index 805289a6350111d43743e215bcf8000cd8609a0c..7e5e4295cc132d138bb9be848fdb1abe8f4a32ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-11-06  Alexander Larsson  <alexl@redhat.com>
+
+        * libnautilus-private/nautilus-icon-container.c:
+        (nautilus_icon_container_ensure_interactive_directory):
+	Set correct hint on search popup window. (#536804)
+
+	Patch from Danny Baumann
+
 2008-10-28  Cosimo Cecchi  <cosimoc@gnome.org>
 
         * src/nautilus-window-menus.c:
diff --git a/libnautilus-private/nautilus-icon-container.c b/libnautilus-private/nautilus-icon-container.c
index a464e0ee67b9a12c949d095c3b20f0e1fe0d3b5f..4054c0912c5542e2e14c602aada001c9067b5d50 100644
--- a/libnautilus-private/nautilus-icon-container.c
+++ b/libnautilus-private/nautilus-icon-container.c
@@ -5133,6 +5133,9 @@ nautilus_icon_container_ensure_interactive_directory (NautilusIconContainer *con
 	container->details->search_window = gtk_window_new (GTK_WINDOW_POPUP);
 
 	gtk_window_set_modal (GTK_WINDOW (container->details->search_window), TRUE);
+	gtk_window_set_type_hint (GTK_WINDOW (container->details->search_window),
+				  GDK_WINDOW_TYPE_HINT_COMBO);
+
 	g_signal_connect (container->details->search_window, "delete_event",
 			  G_CALLBACK (nautilus_icon_container_search_delete_event),
 			  container);