diff --git a/libnautilus-private/nautilus-window-slot-info.c b/libnautilus-private/nautilus-window-slot-info.c
index 9adff6c..f5bcf76 100644
--- a/libnautilus-private/nautilus-window-slot-info.c
+++ b/libnautilus-private/nautilus-window-slot-info.c
@@ -116,7 +116,29 @@ nautilus_window_slot_info_open_location (NautilusWindowSlotInfo  *slot,
 								       location,
 								       mode,
 								       flags,
-								       selection);
+								       selection,
+								       NULL,
+								       NULL);
+}
+
+void
+nautilus_window_slot_info_open_location_with_callback (NautilusWindowSlotInfo  *slot,
+						       GFile                   *location,
+						       NautilusWindowOpenMode   mode,
+						       NautilusWindowOpenFlags  flags,
+						       GList                   *selection,
+						       NautilusWindowGotoCallback callback,
+						       gpointer 		  userdata)
+{
+	g_assert (NAUTILUS_IS_WINDOW_SLOT_INFO (slot));
+
+	(* NAUTILUS_WINDOW_SLOT_INFO_GET_IFACE (slot)->open_location) (slot,
+								       location,
+								       mode,
+								       flags,
+								       selection,
+								       callback,
+								       userdata);
 }
 
 char *
diff --git a/libnautilus-private/nautilus-window-slot-info.h b/libnautilus-private/nautilus-window-slot-info.h
index bc4a066..195eba8 100644
--- a/libnautilus-private/nautilus-window-slot-info.h
+++ b/libnautilus-private/nautilus-window-slot-info.h
@@ -34,6 +34,10 @@
 #define NAUTILUS_IS_WINDOW_SLOT_INFO(obj)        (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NAUTILUS_TYPE_WINDOW_SLOT_INFO))
 #define NAUTILUS_WINDOW_SLOT_INFO_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), NAUTILUS_TYPE_WINDOW_SLOT_INFO, NautilusWindowSlotInfoIface))
 
+typedef void (* NautilusWindowGotoCallback) (NautilusWindow *window,
+                                             gboolean success,
+                                             gpointer userdata);
+
 typedef struct _NautilusWindowSlotInfoIface NautilusWindowSlotInfoIface;
 
 struct _NautilusWindowSlotInfoIface
@@ -72,7 +76,9 @@ struct _NautilusWindowSlotInfoIface
 				       GFile *location,
 				       NautilusWindowOpenMode mode,
 				       NautilusWindowOpenFlags flags,
-				       GList *selection);
+				       GList *selection,
+				       NautilusWindowGotoCallback callback,
+				       gpointer userdata);
 	void   (* make_hosting_pane_active) (NautilusWindowSlotInfo *slot);
 };
 
@@ -84,6 +90,13 @@ void                              nautilus_window_slot_info_open_location
 										 NautilusWindowOpenMode             mode,
 										 NautilusWindowOpenFlags            flags,
 										 GList                             *selection);
+void                              nautilus_window_slot_info_open_location_with_callback (NautilusWindowSlotInfo    *slot,
+										 GFile                             *location,
+										 NautilusWindowOpenMode             mode,
+										 NautilusWindowOpenFlags            flags,
+										 GList                             *selection,
+										 NautilusWindowGotoCallback 	    callback,
+										 gpointer 			    userdata);
 void                              nautilus_window_slot_info_set_status          (NautilusWindowSlotInfo            *slot,
 										 const char *status);
 void                              nautilus_window_slot_info_make_hosting_pane_active (NautilusWindowSlotInfo       *slot);
diff --git a/src/nautilus-location-dialog.c b/src/nautilus-location-dialog.c
index 2a1f502..927e4ea 100644
--- a/src/nautilus-location-dialog.c
+++ b/src/nautilus-location-dialog.c
@@ -70,6 +70,21 @@ nautilus_location_dialog_destroy (GtkObject *object)
 }
 
 static void
+open_cb (NautilusWindow *window, gboolean success, gpointer data)
+{
+	NautilusLocationDialog *dialog;
+
+	dialog = NAUTILUS_LOCATION_DIALOG (data);
+	if (success) {
+		/* everything is fine, kill the window */
+		gtk_widget_destroy (GTK_WIDGET (dialog));
+	} else {
+		/* display the window again */
+		gtk_widget_show (GTK_WIDGET (dialog));
+	}
+}
+
+static void
 open_current_location (NautilusLocationDialog *dialog)
 {
 	GFile *location;
@@ -77,7 +92,7 @@ open_current_location (NautilusLocationDialog *dialog)
 	
 	user_location = gtk_editable_get_chars (GTK_EDITABLE (dialog->details->entry), 0, -1);
 	location = g_file_parse_name (user_location);
-	nautilus_window_go_to (dialog->details->window, location);
+	nautilus_window_go_to_with_callback (dialog->details->window, location, open_cb, dialog);
 	g_object_unref (location);
 	g_free (user_location);
 }
@@ -92,7 +107,7 @@ response_callback (NautilusLocationDialog *dialog,
 	switch (response_id) {
 	case RESPONSE_OPEN :
 		open_current_location (dialog);
-		gtk_widget_destroy (GTK_WIDGET (dialog));
+		gtk_widget_hide (GTK_WIDGET (dialog));
 		break;
 	case GTK_RESPONSE_NONE :
 	case GTK_RESPONSE_DELETE_EVENT :
diff --git a/src/nautilus-window-manage-views.c b/src/nautilus-window-manage-views.c
index bc873a2..007c5a6 100644
--- a/src/nautilus-window-manage-views.c
+++ b/src/nautilus-window-manage-views.c
@@ -86,7 +86,9 @@ static void begin_location_change                     (NautilusWindowSlot
 						       GList                      *new_selection,
 						       NautilusLocationChangeType  type,
 						       guint                       distance,
-						       const char                 *scroll_pos);
+						       const char                 *scroll_pos,
+						       NautilusWindowGotoCallback open_callback,
+						       gpointer 		  open_callback_userdata);
 static void free_location_change                      (NautilusWindowSlot         *slot);
 static void end_location_change                       (NautilusWindowSlot         *slot);
 static void cancel_location_change                    (NautilusWindowSlot         *slot);
@@ -478,7 +480,9 @@ nautilus_window_slot_open_location_full (NautilusWindowSlot *slot,
 					 GFile *location,
 					 NautilusWindowOpenMode mode,
 					 NautilusWindowOpenFlags flags,
-					 GList *new_selection)
+					 GList *new_selection,
+					 NautilusWindowGotoCallback callback,
+					 gpointer userdata)
 {
 	NautilusWindow *window;
         NautilusWindow *target_window;
@@ -628,7 +632,8 @@ nautilus_window_slot_open_location_full (NautilusWindowSlot *slot,
 	}
 
         begin_location_change (target_slot, location, new_selection,
-                               NAUTILUS_LOCATION_CHANGE_STANDARD, 0, NULL);
+                               NAUTILUS_LOCATION_CHANGE_STANDARD, 0, NULL,
+                               callback, userdata);
 
 	/* Additionally, load this in all slots that have no location, this means
 	   we load both panes in e.g. a newly opened dual pane window. */
@@ -637,7 +642,8 @@ nautilus_window_slot_open_location_full (NautilusWindowSlot *slot,
 		slot = pane->active_slot;
 		if (slot->location == NULL && slot->pending_location == NULL) {
 			begin_location_change (slot, location, new_selection,
-					       NAUTILUS_LOCATION_CHANGE_STANDARD, 0, NULL);
+					       NAUTILUS_LOCATION_CHANGE_STANDARD, 0, NULL,
+					       callback, userdata);
 		}
 	}
 }
@@ -656,7 +662,7 @@ nautilus_window_slot_open_location (NautilusWindowSlot *slot,
 	
 	nautilus_window_slot_open_location_full (slot, location,
 						 NAUTILUS_WINDOW_OPEN_ACCORDING_TO_MODE,
-						 flags, NULL);
+						 flags, NULL, NULL, NULL);
 }
 
 void
@@ -673,7 +679,7 @@ nautilus_window_slot_open_location_with_selection (NautilusWindowSlot *slot,
 	}
 	nautilus_window_slot_open_location_full (slot, location,
 						 NAUTILUS_WINDOW_OPEN_ACCORDING_TO_MODE,
-						 flags, selection);
+						 flags, selection, NULL, NULL);
 }
 
 
@@ -694,7 +700,7 @@ nautilus_window_slot_go_home (NautilusWindowSlot *slot, gboolean new_tab)
 	home = g_file_new_for_path (g_get_home_dir ());
 	nautilus_window_slot_open_location_full (slot, home, 
 						 NAUTILUS_WINDOW_OPEN_ACCORDING_TO_MODE, 
-						 flags, NULL);
+						 flags, NULL, NULL, NULL);
 	g_object_unref (home);
 }
 
@@ -796,6 +802,8 @@ nautilus_window_slot_content_view_matches_iid (NautilusWindowSlot *slot,
  * @distance: If type is back or forward, the index into the back or forward chain. If
  * type is standard or reload, this is ignored, and must be 0.
  * @scroll_pos: The file to scroll to when the location is loaded.
+ * @open_callback: function to call when open has finished, successfully or not
+ * @open_callback_userdata: user defined data to callback function
  *
  * This is the core function for changing the location of a window. Every change to the
  * location begins here.
@@ -806,7 +814,9 @@ begin_location_change (NautilusWindowSlot *slot,
 		       GList *new_selection,
                        NautilusLocationChangeType type,
                        guint distance,
-                       const char *scroll_pos)
+                       const char *scroll_pos,
+		       NautilusWindowGotoCallback open_callback,
+		       gpointer open_callback_userdata)
 {
 	NautilusWindow *window;
         NautilusDirectory *directory;
@@ -839,6 +849,8 @@ begin_location_change (NautilusWindowSlot *slot,
 	slot->pending_selection = eel_g_object_list_copy (new_selection);
 
 	slot->pending_scroll_to = g_strdup (scroll_pos);
+	slot->open_callback = open_callback;
+	slot->open_callback_userdata = open_callback_userdata;
         
         directory = nautilus_directory_get (location);
 
@@ -1126,6 +1138,14 @@ got_file_info_for_view_selection_callback (NautilusFile *file,
 		}
 		create_content_view (slot, view_id);
 		g_free (view_id);
+		if (window->details->active_pane->active_slot->open_callback) {
+			window->details->active_pane->active_slot->open_callback (
+					window, 
+					TRUE, 
+					window->details->active_pane->active_slot->open_callback_userdata);
+		}
+		window->details->active_pane->active_slot->open_callback = NULL;
+		window->details->active_pane->active_slot->open_callback_userdata = NULL;
 	} else {
 		display_view_selection_failure (window, file,
 						location, error);
@@ -1719,6 +1739,13 @@ end_location_change (NautilusWindowSlot *slot)
 	g_free (slot->pending_scroll_to);
 	slot->pending_scroll_to = NULL;
 
+	if (slot->open_callback) {
+		/* callback has not been called - call it with success */
+		slot->open_callback (window, TRUE, slot->open_callback_userdata);
+	}
+	slot->open_callback = NULL;
+	slot->open_callback_userdata = NULL;
+
 	free_location_change (slot);
 }
 
@@ -1834,7 +1861,7 @@ nautilus_window_report_view_failed (NautilusWindow *window,
 	if (fallback_load_location != NULL) {
 		/* We loose the pending selection change here, but who cares... */
 		begin_location_change (slot, fallback_load_location, NULL,
-				       NAUTILUS_LOCATION_CHANGE_FALLBACK, 0, NULL);
+				       NAUTILUS_LOCATION_CHANGE_FALLBACK, 0, NULL, NULL, NULL);
 		g_object_unref (fallback_load_location);
 	}
 
@@ -1843,6 +1870,26 @@ nautilus_window_report_view_failed (NautilusWindow *window,
 	}
 }
 
+typedef struct {
+	NautilusWindowGotoCallback callback;
+	gpointer userdata;
+	NautilusWindow *window;
+} ErrorCallbackParameter;
+
+static void
+error_message_destroy_callback (GtkDialog *dialog,
+				gpointer data)
+{
+	ErrorCallbackParameter *params;
+
+	params = data;
+
+	if (params->callback) {
+		params->callback (params->window, FALSE, params->userdata);
+	}
+	g_slice_free (ErrorCallbackParameter, params);
+}
+
 static void
 display_view_selection_failure (NautilusWindow *window, NautilusFile *file,
 				GFile *location, GError *error)
@@ -1853,6 +1900,7 @@ display_view_selection_failure (NautilusWindow *window, NautilusFile *file,
 	char *detail_message;
 	char *scheme_string;
 	GtkDialog *dialog;
+	ErrorCallbackParameter *params;
 
 	/* Some sort of failure occurred. How 'bout we tell the user? */
 	full_uri_for_display = g_file_get_parse_name (location);
@@ -1939,14 +1987,27 @@ display_view_selection_failure (NautilusWindow *window, NautilusFile *file,
 		detail_message = g_strdup_printf (_("Error: %s\nPlease select another viewer and try again."), error->message);
 	}
 	
+	params = g_slice_new (ErrorCallbackParameter);
+	params->callback = window->details->active_pane->active_slot->open_callback;
+	params->userdata = window->details->active_pane->active_slot->open_callback_userdata;
+	params->window = window;
+
 	dialog = eel_show_error_dialog (error_message, detail_message, NULL);
 	
 	g_free (uri_for_display);
+
+	g_signal_connect (dialog,
+			  "destroy",
+			  G_CALLBACK (error_message_destroy_callback),
+			  params);
+
+	window->details->active_pane->active_slot->open_callback = NULL;
+	window->details->active_pane->active_slot->open_callback_userdata = NULL;
+
 	g_free (error_message);
 	g_free (detail_message);
 }
 
-
 void
 nautilus_window_slot_stop_loading (NautilusWindowSlot *slot)
 {
@@ -2055,7 +2116,7 @@ nautilus_navigation_window_back_or_forward (NautilusNavigationWindow *window,
 		nautilus_window_slot_open_location_full (slot, location,
 							 NAUTILUS_WINDOW_OPEN_ACCORDING_TO_MODE,
 							 NAUTILUS_WINDOW_OPEN_FLAG_NEW_TAB,
-							 NULL);
+							 NULL, NULL, NULL);
 	} else {
         	char *scroll_pos;
 		
@@ -2065,7 +2126,9 @@ nautilus_navigation_window_back_or_forward (NautilusNavigationWindow *window,
 			 location, NULL,
 			 back ? NAUTILUS_LOCATION_CHANGE_BACK : NAUTILUS_LOCATION_CHANGE_FORWARD,
 			 distance,
-			 scroll_pos);
+			 scroll_pos,
+			 NULL,
+			 NULL);
 
 		g_free (scroll_pos);
 	}
@@ -2099,7 +2162,8 @@ nautilus_window_slot_reload (NautilusWindowSlot *slot)
 	}
 	begin_location_change
 		(slot, location, selection,
-		 NAUTILUS_LOCATION_CHANGE_RELOAD, 0, current_pos);
+		 NAUTILUS_LOCATION_CHANGE_RELOAD, 0, current_pos,
+		 NULL, NULL);
         g_free (current_pos);
 	g_object_unref (location);
 	eel_g_object_list_free (selection);
diff --git a/src/nautilus-window-slot.h b/src/nautilus-window-slot.h
index ce276d8..e89d8c8 100644
--- a/src/nautilus-window-slot.h
+++ b/src/nautilus-window-slot.h
@@ -107,6 +107,9 @@ struct NautilusWindowSlot {
 	GError *mount_error;
 	gboolean tried_mount;
 
+	NautilusWindowGotoCallback open_callback;
+	gpointer open_callback_userdata;
+
 	GCancellable *find_mount_cancellable;
 
 	gboolean visible;
@@ -136,7 +139,9 @@ void			nautilus_window_slot_open_location_full       (NautilusWindowSlot	*slot,
 								       GFile			*location,
 								       NautilusWindowOpenMode	 mode,
 								       NautilusWindowOpenFlags	 flags,
-								       GList			*new_selection);
+								       GList			*new_selection,
+								       NautilusWindowGotoCallback open_callback,
+								       gpointer 		 open_callback_userdata);
 void			nautilus_window_slot_stop_loading	      (NautilusWindowSlot	*slot);
 
 void			nautilus_window_slot_set_content_view	      (NautilusWindowSlot	*slot,
@@ -150,10 +155,15 @@ void                    nautilus_window_slot_connect_content_view     (NautilusW
 void                    nautilus_window_slot_disconnect_content_view  (NautilusWindowSlot       *slot,
 								       NautilusView             *view);
 
+#define nautilus_window_slot_go_to_full(slot,location, new_tab, callback, userdata) \
+	nautilus_window_slot_open_location_full(slot, location, NAUTILUS_WINDOW_OPEN_ACCORDING_TO_MODE, \
+						(new_tab ? NAUTILUS_WINDOW_OPEN_FLAG_NEW_TAB : 0), \
+						NULL, callback, userdata)
+
 #define nautilus_window_slot_go_to(slot,location, new_tab) \
 	nautilus_window_slot_open_location_full(slot, location, NAUTILUS_WINDOW_OPEN_ACCORDING_TO_MODE, \
 						(new_tab ? NAUTILUS_WINDOW_OPEN_FLAG_NEW_TAB : 0), \
-						NULL)
+						NULL, NULL, NULL)
 
 #define nautilus_window_slot_go_to_with_selection(slot,location,new_selection) \
 	nautilus_window_slot_open_location_with_selection(slot, location, new_selection, FALSE)
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index 854fcf2..91962bc 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -234,11 +234,23 @@ nautilus_window_sync_status (NautilusWindow *window)
 }
 
 void
-nautilus_window_go_to (NautilusWindow *window, GFile *location)
+nautilus_window_go_to_with_callback (NautilusWindow *window, 
+				     GFile *location, 
+				     NautilusWindowGotoCallback callback,
+				     gpointer userdata)
 {
 	g_return_if_fail (NAUTILUS_IS_WINDOW (window));
 
-	nautilus_window_slot_go_to (window->details->active_pane->active_slot, location, FALSE);
+	nautilus_window_slot_go_to_full (window->details->active_pane->active_slot, location, FALSE, callback, userdata);
+}
+
+void
+nautilus_window_go_to (NautilusWindow *window, 
+		       GFile *location)
+{
+	g_return_if_fail (NAUTILUS_IS_WINDOW (window));
+
+	nautilus_window_slot_go_to_full (window->details->active_pane->active_slot, location, FALSE, NULL, NULL);
 }
 
 void
@@ -291,7 +303,7 @@ nautilus_window_go_up (NautilusWindow *window, gboolean close_behind, gboolean n
 	nautilus_window_slot_open_location_full (slot, parent, 
 						 NAUTILUS_WINDOW_OPEN_ACCORDING_TO_MODE,
 						 flags,
-						 selection);
+						 selection, NULL, NULL);
 	
 	g_object_unref (parent);
 	
diff --git a/src/nautilus-window.h b/src/nautilus-window.h
index e81fea7..f3a08a9 100644
--- a/src/nautilus-window.h
+++ b/src/nautilus-window.h
@@ -34,6 +34,7 @@
 #include <libnautilus-private/nautilus-bookmark.h>
 #include <libnautilus-private/nautilus-window-info.h>
 #include <libnautilus-private/nautilus-search-directory.h>
+#include <libnautilus-private/nautilus-window-slot-info.h>
 #include "nautilus-application.h"
 #include "nautilus-information-panel.h"
 #include "nautilus-side-pane.h"
@@ -134,6 +135,10 @@ void             nautilus_window_disconnect_content_view (NautilusWindow    *win
 
 void             nautilus_window_go_to                (NautilusWindow    *window,
                                                        GFile             *location);
+void             nautilus_window_go_to_with_callback  (NautilusWindow    *window,
+                                                       GFile             *location,
+                                                       NautilusWindowGotoCallback callback,
+                                                       gpointer          cb_userdata);
 void             nautilus_window_go_to_with_selection (NautilusWindow    *window,
                                                        GFile             *location,
                                                        GList             *new_selection);
