diff --git a/platform/lang-impl/src/com/intellij/platform/renameProject/RenameProjectHandler.java b/platform/lang-impl/src/com/intellij/platform/renameProject/RenameProjectHandler.java
index 2b8976efffe9..9baec60bca13 100644
--- a/platform/lang-impl/src/com/intellij/platform/renameProject/RenameProjectHandler.java
+++ b/platform/lang-impl/src/com/intellij/platform/renameProject/RenameProjectHandler.java
@@ -32,6 +32,7 @@ import com.intellij.openapi.project.ex.ProjectEx;
 import com.intellij.openapi.ui.InputValidator;
 import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.util.Ref;
+import com.intellij.platform.ModuleAttachProcessor;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.refactoring.RefactoringBundle;
@@ -79,7 +80,7 @@ public class RenameProjectHandler implements RenameHandler, TitledHandler {
     LOG.assertTrue(module != null);
     Messages.showInputDialog(project, RefactoringBundle.message("enter.new.project.name"), RefactoringBundle.message("rename.project"),
                              Messages.getQuestionIcon(),
-                             project.getName(),
+                             module.getName(),
                              new MyInputValidator((ProjectEx)project, module));
   }
 
@@ -100,7 +101,7 @@ public class RenameProjectHandler implements RenameHandler, TitledHandler {
 
     @Override
     public boolean canClose(final String inputString) {
-      if (!inputString.equals(myProject.getName())) {
+      if (!inputString.equals(myProject.getName()) && (myModule == null || myModule == ModuleAttachProcessor.getPrimaryModule(myProject))) {
         myProject.setProjectName(inputString);
         myProject.save();
       }
diff --git a/python/src/META-INF/pycharm-core.xml b/python/src/META-INF/pycharm-core.xml
index 9dc69a9b9409..7a4a9c694cda 100644
--- a/python/src/META-INF/pycharm-core.xml
+++ b/python/src/META-INF/pycharm-core.xml
@@ -72,6 +72,9 @@
     <bundledColorScheme path="/colorSchemes/monokai"/>
     <bundledColorScheme path="/colorSchemes/twilight"/>
     <bundledColorScheme path="/colorSchemes/WarmNeon"/>
+
+    <renameHandler implementation="com.intellij.platform.renameProject.RenameProjectHandler"/>
+    <renameHandler implementation="com.intellij.platform.renameProject.ProjectFolderRenameHandler"/>
   </extensions>
 
   <actions>