diff -rN -u old-nautilus-2.15.91/src/nautilus-navigation-window.c new-nautilus-2.15.91/src/nautilus-navigation-window.c
--- old-nautilus-2.15.91/src/nautilus-navigation-window.c	2006-08-31 17:47:34.223025750 +1200
+++ new-nautilus-2.15.91/src/nautilus-navigation-window.c	2006-08-31 17:47:34.322982000 +1200
@@ -405,14 +405,6 @@
 		}
 		window->details->temporary_navigation_bar = FALSE;
 	}
-	if (window->details->temporary_search_bar) {
-		if (!eel_preferences_get_boolean (NAUTILUS_PREFERENCES_ALWAYS_USE_LOCATION_ENTRY)) {
-			nautilus_navigation_window_set_bar_mode (window, NAUTILUS_BAR_PATH);
-		} else {
-			nautilus_navigation_window_set_bar_mode (window, NAUTILUS_BAR_NAVIGATION);
-		}
-		window->details->temporary_search_bar = FALSE;
-	}
 }
 
 static void
@@ -979,8 +971,7 @@
 static void
 nautilus_navigation_window_show_navigation_bar_temporarily (NautilusNavigationWindow *window)
 {
-	if (nautilus_navigation_window_path_bar_showing (window)
-	    || nautilus_navigation_window_search_bar_showing (window)) {
+	if (nautilus_navigation_window_path_bar_showing (window)) {
 		nautilus_navigation_window_set_bar_mode (window, NAUTILUS_BAR_NAVIGATION);
 		window->details->temporary_navigation_bar = TRUE;
 	}
@@ -1031,8 +1022,6 @@
 	nav_window = NAUTILUS_NAVIGATION_WINDOW (window);
 
 	if (!search_mode) {
-		nav_window->details->temporary_search_bar = TRUE;
-		hide_temporary_bars (nav_window);
 		return;
 	}
 
@@ -1040,9 +1029,7 @@
 		query_editor = nautilus_query_editor_new (TRUE,
 							  nautilus_search_directory_is_indexed (search_directory));
 	} else {
-		nautilus_navigation_window_show_location_bar_temporarily (nav_window);
 		nautilus_navigation_window_set_bar_mode (nav_window, NAUTILUS_BAR_SEARCH);
-		nav_window->details->temporary_search_bar = FALSE;
 
 		query_editor = nautilus_query_editor_new (
 			FALSE, 
@@ -1172,13 +1159,6 @@
 	return TRUE;
 }
 
-gboolean
-nautilus_navigation_window_search_bar_showing (NautilusNavigationWindow *window)
-{
-	/* If we're not visible yet we haven't changed visibility, so its TRUE */
-	return TRUE;
-}
-
 static void
 nautilus_navigation_window_set_bar_mode (NautilusNavigationWindow *window,
 					 NautilusBarMode mode)
diff -rN -u old-nautilus-2.15.91/src/nautilus-navigation-window.h new-nautilus-2.15.91/src/nautilus-navigation-window.h
--- old-nautilus-2.15.91/src/nautilus-navigation-window.h	2006-08-31 17:47:34.219027500 +1200
+++ new-nautilus-2.15.91/src/nautilus-navigation-window.h	2006-08-31 17:47:34.322982000 +1200
@@ -99,8 +99,6 @@
 void     nautilus_navigation_window_show_path_bar        (NautilusNavigationWindow *window);
 gboolean nautilus_navigation_window_path_bar_showing 	 (NautilusNavigationWindow *window);
 
-gboolean nautilus_navigation_window_search_bar_showing 	 (NautilusNavigationWindow *window);
-
 gboolean nautilus_navigation_window_location_bar_showing (NautilusNavigationWindow *window);
 void     nautilus_navigation_window_hide_toolbar         (NautilusNavigationWindow *window);
 void     nautilus_navigation_window_show_toolbar         (NautilusNavigationWindow *window);
diff -rN -u old-nautilus-2.15.91/src/nautilus-window-private.h new-nautilus-2.15.91/src/nautilus-window-private.h
--- old-nautilus-2.15.91/src/nautilus-window-private.h	2006-08-31 17:47:34.219027500 +1200
+++ new-nautilus-2.15.91/src/nautilus-window-private.h	2006-08-31 17:47:34.322982000 +1200
@@ -108,7 +108,6 @@
         /* Location bar */
         gboolean temporary_navigation_bar;
         gboolean temporary_location_bar;
-        gboolean temporary_search_bar;
 
         GtkWidget *location_button;
 

