diff --git a/bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/RemoteConnectionType.java b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/RemoteConnectionType.java
index 3b86f59d174..7ad58638da6 100644
--- a/bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/RemoteConnectionType.java
+++ b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/RemoteConnectionType.java
@@ -13,7 +13,6 @@ package org.eclipse.remote.internal.core;
 import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.net.URLDecoder;
-import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
diff --git a/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/widgets/RemoteConnectionWidget.java b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/widgets/RemoteConnectionWidget.java
index cdcc15486fd..924c5ace956 100644
--- a/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/widgets/RemoteConnectionWidget.java
+++ b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/widgets/RemoteConnectionWidget.java
@@ -109,6 +109,8 @@ public class RemoteConnectionWidget extends Composite {
 					handleNewRemoteConnectionSelected();
 				} else if (source == fLocalButton) {
 					handleButtonSelected();
+				} else if (source == fRemoteButton) {
+					handleButtonSelected();
 				}
 			}
 		}
@@ -288,6 +290,7 @@ public class RemoteConnectionWidget extends Composite {
 			fRemoteButton = new Button(body, SWT.RADIO);
 			fRemoteButton.setText(Messages.RemoteConnectionWidget_Remote);
 			fRemoteButton.setLayoutData(new GridData());
+			fRemoteButton.addSelectionListener(fWidgetListener);
 		} else {
 			Label remoteLabel = new Label(body, SWT.NONE);
 			remoteLabel.setText(Messages.RemoteConnectionWidget_Connection_Name);