diff --git a/python/ide/src/com/jetbrains/python/PyCharmInitialConfigurator.java b/python/ide/src/com/jetbrains/python/PyCharmInitialConfigurator.java
index 7c248debf19e..2ed6694c6975 100644
--- a/python/ide/src/com/jetbrains/python/PyCharmInitialConfigurator.java
+++ b/python/ide/src/com/jetbrains/python/PyCharmInitialConfigurator.java
@@ -76,6 +76,11 @@ public class PyCharmInitialConfigurator {
       propertiesComponent.setValue("PyCharm.InitialConfiguration.V5", true);
       CodeInsightSettings.getInstance().REFORMAT_ON_PASTE = CodeInsightSettings.NO_REFORMAT;
     }
+    if (!propertiesComponent.getBoolean("PyCharm.InitialConfiguration.V6")) {
+      propertiesComponent.setValue("PyCharm.InitialConfiguration.V6", true);
+      CodeInsightSettings.getInstance().INDENT_TO_CARET_ON_PASTE = true;
+    }
+
     if (!propertiesComponent.isValueSet(DISPLAYED_PROPERTY)) {
       bus.connect().subscribe(AppLifecycleListener.TOPIC, new AppLifecycleListener.Adapter() {
         @Override