diff --git a/platform/lang-impl/src/com/intellij/execution/impl/RunManagerImpl.java b/platform/lang-impl/src/com/intellij/execution/impl/RunManagerImpl.java
index ebea038dc0fc..e8e7a2f74795 100644
--- a/platform/lang-impl/src/com/intellij/execution/impl/RunManagerImpl.java
+++ b/platform/lang-impl/src/com/intellij/execution/impl/RunManagerImpl.java
@@ -508,6 +508,8 @@ public class RunManagerImpl extends RunManagerEx implements JDOMExternalizable,
     myUnloadedElements = null;
     myConfigurationToBeforeTasksMap.clear();
     mySharedConfigurations.clear();
+    myTemplateConfigurationsMap.clear();
+    mySelectedConfiguration = null;
     myIdToIcon.clear();
     fireRunConfigurationsRemoved(configurations);
   }