diff --git a/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/dialogs/RemoteResourceBrowser.java b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/dialogs/RemoteResourceBrowser.java
index 118632e87f8..e7fcfeeb7f2 100644
--- a/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/dialogs/RemoteResourceBrowser.java
+++ b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/dialogs/RemoteResourceBrowser.java
@@ -116,12 +116,12 @@ public class RemoteResourceBrowser extends Dialog implements IRunnableContext {
 		} else {
 			setTitle(fDialogTitle);
 		}
-		if (fConnection != null) {
-			fResourceBrowserWidget.setConnection(fConnection);
-		}
 		if (fInitialPath != null) {
 			fResourceBrowserWidget.setInitialPath(fInitialPath);
 		}
+		if (fConnection != null) {
+			fResourceBrowserWidget.setConnection(fConnection);
+		}
 		updateDialog();
 		return contents;
 	}
diff --git a/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/widgets/RemoteResourceBrowserWidget.java b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/widgets/RemoteResourceBrowserWidget.java
index 76ced9fce6f..c75498445f4 100644
--- a/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/widgets/RemoteResourceBrowserWidget.java
+++ b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/widgets/RemoteResourceBrowserWidget.java
@@ -517,6 +517,8 @@ public class RemoteResourceBrowserWidget extends Composite {
 	 * text field, and in a future version should expand the browser to this
 	 * location if it exists.
 	 * 
+	 * NOTE: This must be called *before* {@link #setConnection(IRemoteConnection)} to have any effect.
+	 * 
 	 * @param path
 	 */
 	public void setInitialPath(String path) {