diff -crB thunar/thunar-location-entry.c thunar-withlocbaronseplinemod/thunar-location-entry.c
*** thunar/thunar-location-entry.c	2009-09-30 10:23:34.000000000 +1000
--- thunar-withlocbaronseplinemod/thunar-location-entry.c	2009-10-02 00:46:57.000000000 +1000
***************
*** 175,181 ****
  thunar_location_entry_location_bar_init (ThunarLocationBarIface *iface)
  {
    iface->accept_focus = thunar_location_entry_accept_focus;
!   iface->is_standalone = (gpointer) exo_noop_false;
  }
  
  
--- 175,181 ----
  thunar_location_entry_location_bar_init (ThunarLocationBarIface *iface)
  {
    iface->accept_focus = thunar_location_entry_accept_focus;
!   iface->is_standalone = (gpointer) exo_noop_true;
  }
  
  
diff -crB thunar/thunar-window.c thunar-withlocbaronseplinemod/thunar-window.c
*** thunar/thunar-window.c	2009-09-30 10:23:34.000000000 +1000
--- thunar-withlocbaronseplinemod/thunar-window.c	2009-10-02 00:48:53.000000000 +1000
***************
*** 1239,1244 ****
--- 1239,1249 ----
            gtk_container_remove (GTK_CONTAINER (window->table), window->location_toolbar);
            window->location_toolbar = NULL;
          }
+         else
+         {
+ 		gtk_container_remove (GTK_CONTAINER (window->table), window->location_toolbar);
+ 		window->location_toolbar = NULL;     	  	
+ 	}	
  
        /* destroy the location bar */
        gtk_widget_destroy (window->location_bar);
***************
*** 1283,1288 ****
--- 1288,1298 ----
          }
        else
          {
+ 	   /* setup the toolbar for the location bar */
+ 	  window->location_toolbar = gtk_ui_manager_get_widget (window->ui_manager, "/location-toolbar");
+ 	  gtk_table_attach (GTK_TABLE (window->table), window->location_toolbar, 0, 1, 1, 2, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
+ 	  gtk_widget_show (window->location_toolbar);
+ 
            /* it's a standalone location bar, just place it above the view */
            gtk_box_pack_start (GTK_BOX (window->view_box), window->location_bar, FALSE, FALSE, 0);
          }