diff --git a/python/python-sdk/src/com/jetbrains/python/packaging/PyCondaPackageService.java b/python/python-sdk/src/com/jetbrains/python/packaging/PyCondaPackageService.java
index 030deeabe4d6..3424fd4ffb52 100644
--- a/python/python-sdk/src/com/jetbrains/python/packaging/PyCondaPackageService.java
+++ b/python/python-sdk/src/com/jetbrains/python/packaging/PyCondaPackageService.java
@@ -80,13 +80,18 @@ public class PyCondaPackageService implements PersistentStateComponent<PyCondaPa
   }
 
   @NotNull
-  private static String getPythonName() {
+  public static String getPythonName() {
     return SystemInfo.isWindows ? "python.exe" : "python";
   }
 
+  @NotNull
+  public static String getCondaName() {
+    return SystemInfo.isWindows ? "conda.exe" : "conda";
+  }
+
   @Nullable
   public static String getSystemCondaExecutable() {
-    final String condaName = SystemInfo.isWindows ? "conda.exe" : "conda";
+    final String condaName = getCondaName();
     final File condaInPath = PathEnvironmentVariableUtil.findInPath(condaName);
     if (condaInPath != null) return condaInPath.getPath();
     return getCondaExecutableByName(condaName);
diff --git a/python/src/com/jetbrains/python/sdk/PySdkExt.kt b/python/src/com/jetbrains/python/sdk/PySdkExt.kt
index 6d235db4a9cc..ed0512d15e86 100644
--- a/python/src/com/jetbrains/python/sdk/PySdkExt.kt
+++ b/python/src/com/jetbrains/python/sdk/PySdkExt.kt
@@ -43,6 +43,8 @@ import com.intellij.util.PathUtil
 import com.intellij.util.ThreeState
 import com.intellij.webcore.packaging.PackagesNotificationPanel
 import com.jetbrains.python.PyBundle
+import com.jetbrains.python.packaging.PyCondaPackageService.getCondaName
+import com.jetbrains.python.packaging.PyCondaPackageService.getPythonName
 import com.jetbrains.python.packaging.ui.PyPackageManagementService
 import com.jetbrains.python.psi.LanguageLevel
 import com.jetbrains.python.sdk.flavors.CondaEnvSdkFlavor
@@ -113,6 +115,19 @@ fun filterSharedCondaEnvs(module: Module?, existingSdks: List<Sdk>): List<Sdk> {
 fun detectCondaEnvs(module: Module?, existingSdks: List<Sdk>, context: UserDataHolder): List<PyDetectedSdk> =
   filterSuggestedPaths(CondaEnvSdkFlavor.getInstance().suggestHomePaths(module, context), existingSdks, module, true)
 
+fun guessCondaBaseEnvironment(condaPath: String): Sdk? {
+  if (!condaPath.endsWith(File.separatorChar + getCondaName())) {
+    return null
+  }
+
+  val interpreterPath = condaPath.replaceAfterLast(File.separatorChar, getPythonName())
+  val condaVirtualFile = VfsUtil.findFileByIoFile(File(interpreterPath), false)
+  if (condaVirtualFile != null && condaVirtualFile.exists()) {
+    return PyDetectedSdk(condaVirtualFile.path)
+  }
+  return null
+}
+
 fun filterAssociatedSdks(module: Module, existingSdks: List<Sdk>): List<Sdk> {
   return existingSdks.filter { it.sdkType is PythonSdkType && it.isAssociatedWithModule(module) }
 }
diff --git a/python/src/com/jetbrains/python/sdk/add/PyAddSdkPanel.kt b/python/src/com/jetbrains/python/sdk/add/PyAddSdkPanel.kt
index 65152cdf086d..73caacb33c46 100644
--- a/python/src/com/jetbrains/python/sdk/add/PyAddSdkPanel.kt
+++ b/python/src/com/jetbrains/python/sdk/add/PyAddSdkPanel.kt
@@ -141,6 +141,7 @@ fun addInterpretersAsync(sdkComboBox: PySdkPathChoosingComboBox,
     finally {
       executor.execute {
         sdkComboBox.setBusy(false)
+        sdkComboBox.childComponent.removeAllItems()
         sdks.forEach(sdkComboBox.childComponent::addItem)
         onAdded()
       }