diff --git a/platform/execution-impl/src/com/intellij/execution/runToolbar/RunToolbarSlotManager.kt b/platform/execution-impl/src/com/intellij/execution/runToolbar/RunToolbarSlotManager.kt
index 2b673ff26fcb..695f1847b987 100644
--- a/platform/execution-impl/src/com/intellij/execution/runToolbar/RunToolbarSlotManager.kt
+++ b/platform/execution-impl/src/com/intellij/execution/runToolbar/RunToolbarSlotManager.kt
@@ -16,7 +16,6 @@ import com.intellij.openapi.ui.Messages
 import com.intellij.openapi.util.CheckedDisposable
 import com.intellij.openapi.util.Disposer
 import com.intellij.ui.AppUIUtil
-import com.intellij.util.messages.MessageBusConnection
 import com.intellij.util.messages.Topic
 import java.util.*
 import javax.swing.SwingUtilities
@@ -152,6 +151,17 @@ class RunToolbarSlotManager(val project: Project) {
               update()
             }
           }
+
+          override fun runConfigurationRemoved(settings: RunnerAndConfigurationSettings) {
+            var changed = false
+            slotsData.filter { it.value == settings && it.value.environment == null }.forEach {
+              changed = true
+              it.value.configuration = RunManager.getInstance(project).selectedConfiguration
+            }
+            if (changed) {
+              update()
+            }
+          }
         })
 
         listeners.forEach { it.enabled() }