diff --git a/python/src/com/jetbrains/python/sdk/pipenv/PyAddPipEnvPanel.kt b/python/src/com/jetbrains/python/sdk/pipenv/PyAddPipEnvPanel.kt
index d0d3d93c16dc..ab2c5b80c65d 100644
--- a/python/src/com/jetbrains/python/sdk/pipenv/PyAddPipEnvPanel.kt
+++ b/python/src/com/jetbrains/python/sdk/pipenv/PyAddPipEnvPanel.kt
@@ -129,7 +129,7 @@ class PyAddPipEnvPanel(private val project: Project?,
   }
 
   override fun validateAll(): List<ValidationInfo> =
-    listOfNotNull(validatePipEnvExecutable(pipEnvPathField.text), validatePipEnvIsNotAdded())
+    listOfNotNull(validatePipEnvExecutable(), validatePipEnvIsNotAdded())
 
   override fun addChangeListener(listener: Runnable) {
     pipEnvPathField.textField.document.addDocumentListener(object : DocumentAdapter() {
@@ -155,6 +155,10 @@ class PyAddPipEnvPanel(private val project: Project?,
   private val selectedModule: Module?
     get() = module ?: moduleField.selectedItem as? Module
 
+  private fun validatePipEnvExecutable(): ValidationInfo? {
+    return validatePipEnvExecutable(pipEnvPathField.text.nullize() ?: detectPipEnvExecutable()?.absolutePath)
+  }
+
   /**
    * Checks if the pipenv for the project hasn't been already added.
    */