diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/configuration/deployment/RemoteServerCombo.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/configuration/deployment/RemoteServerCombo.java
index 4bc0114fe31c..db1f9e989ea3 100644
--- a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/configuration/deployment/RemoteServerCombo.java
+++ b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/configuration/deployment/RemoteServerCombo.java
@@ -128,6 +128,9 @@ public class RemoteServerCombo<S extends ServerConfiguration> extends ComboboxWi
     if (item != null) {
       item.onBrowseAction();
     }
+    else {
+      editServer(RemoteServerListConfigurable.createConfigurable(myServerType, null));
+    }
   }
 
   private void onItemChosen(ActionEvent e) {