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 5c850c89ff9..5e1b463b782 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
@@ -264,7 +264,7 @@ public class RemoteResourceBrowser extends Dialog implements IRunnableContext {
 	 *            connection that supports the IRemoteFileService service
 	 */
 	public void setConnection(IRemoteConnection connection) {
-		if (connection.hasService(IRemoteFileService.class)) {
+		if (connection != null && connection.hasService(IRemoteFileService.class)) {
 			fConnection = connection;
 		}
 	}
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 2ed8ebd9bd4..ba07ac4cbab 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
@@ -220,6 +220,8 @@ public class RemoteResourceBrowserWidget extends Composite {
 			fRemoteConnectionWidget = new RemoteConnectionWidget(mainComp, SWT.NONE, "", //$NON-NLS-1$
 					(fOptionFlags & SHOW_LOCAL_SELECTION) == 0 ? RemoteConnectionWidget.FLAG_NO_LOCAL_SELECTION : 0);
 			fRemoteConnectionWidget.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
+			// Must happen before adding selection listener as this will trigger selection event
+			fRemoteConnectionWidget.filterConnections(IRemoteFileService.class);
 			fRemoteConnectionWidget.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent event) {
@@ -237,7 +239,6 @@ public class RemoteResourceBrowserWidget extends Composite {
 					}));
 				}
 			});
-			fRemoteConnectionWidget.filterConnections(IRemoteFileService.class);
 		}
 
 		Composite textComp = new Composite(mainComp, SWT.NONE);