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 147c7f84dfb1..4bc0114fe31c 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
@@ -171,8 +171,7 @@ public class RemoteServerCombo<S extends ServerConfiguration> extends ComboboxWi
   }
 
   protected final void refillModel(@Nullable RemoteServer<?> newSelection) {
-    String nameToSelect = newSelection != null ? newSelection.getName() :
-                          (getSelectedItem() != null ? getSelectedItem().getServerName() : null);
+    String nameToSelect = newSelection != null ? newSelection.getName() : null;
 
     myServerListModel.removeAll();
     ServerItem itemToSelect = null;
@@ -198,7 +197,7 @@ public class RemoteServerCombo<S extends ServerConfiguration> extends ComboboxWi
       myServerListModel.add(nextAction);
     }
 
-    myServerListModel.setSelectedItem(itemToSelect);
+    getComboBox().setSelectedItem(itemToSelect);
   }
 
   @NotNull