diff --git a/python/edu/src/META-INF/PyCharmEduPlugin.xml b/python/edu/src/META-INF/PyCharmEduPlugin.xml
index 87739a948968..2956e7d028f7 100644
--- a/python/edu/src/META-INF/PyCharmEduPlugin.xml
+++ b/python/edu/src/META-INF/PyCharmEduPlugin.xml
@@ -8,7 +8,7 @@
     </component>
   </application-components>
 
-  <xi:include href="/META-INF/pycharm-community.xml" xpointer="xpointer(/idea-plugin/*)"/>
+  <xi:include href="/META-INF/pycharm-core.xml" xpointer="xpointer(/idea-plugin/*)"/>
 
   <xi:include href="/META-INF/python-core.xml" xpointer="xpointer(/idea-plugin/*)"/>
 
diff --git a/python/edu/src/com/jetbrains/python/edu/PyCharmEduInitialConfigurator.java b/python/edu/src/com/jetbrains/python/edu/PyCharmEduInitialConfigurator.java
index 7bee168b7573..976d99c56da8 100644
--- a/python/edu/src/com/jetbrains/python/edu/PyCharmEduInitialConfigurator.java
+++ b/python/edu/src/com/jetbrains/python/edu/PyCharmEduInitialConfigurator.java
@@ -16,7 +16,6 @@
 package com.jetbrains.python.edu;
 
 import com.google.common.collect.Sets;
-import com.intellij.application.options.InitialConfigurationDialog;
 import com.intellij.codeInsight.CodeInsightSettings;
 import com.intellij.codeInsight.intention.IntentionActionBean;
 import com.intellij.codeInsight.intention.IntentionManager;
@@ -57,7 +56,6 @@ import com.jetbrains.python.codeInsight.PyCodeInsightSettings;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 
-import javax.swing.*;
 import java.util.Set;
 
 /**
@@ -135,7 +133,6 @@ public class PyCharmEduInitialConfigurator {
               if (!propertiesComponent.isValueSet(DISPLAYED_PROPERTY)) {
                 GeneralSettings.getInstance().setShowTipsOnStartup(false);
                 propertiesComponent.setValue(DISPLAYED_PROPERTY, "true");
-                showInitialConfigurationDialog();
 
                 patchKeymap();
               }
@@ -240,13 +237,4 @@ public class PyCharmEduInitialConfigurator {
     }
   }
 
-  private static void showInitialConfigurationDialog() {
-    final JFrame frame = WindowManager.getInstance().findVisibleFrame();
-    new InitialConfigurationDialog(frame, "Python") {
-      @Override
-      protected boolean canCreateLauncherScript() {
-        return false;
-      }
-    }.show();
-  }
 }
diff --git a/python/src/META-INF/PyCharmCorePlugin.xml b/python/src/META-INF/PyCharmCorePlugin.xml
index c6202d8022ed..e5f00f76ad07 100644
--- a/python/src/META-INF/PyCharmCorePlugin.xml
+++ b/python/src/META-INF/PyCharmCorePlugin.xml
@@ -7,5 +7,9 @@
       <interface-class>com.jetbrains.python.console.PythonConsoleRunnerFactory</interface-class>
       <implementation-class>com.jetbrains.python.console.PythonToolWindowConsoleRunnerFactory</implementation-class>
     </component>
+    <component>
+      <implementation-class>com.jetbrains.python.PyCharmInitialConfigurator</implementation-class>
+      <headless-implementation-class/>
+    </component>
   </application-components>
 </idea-plugin>
diff --git a/python/src/META-INF/pycharm-core.xml b/python/src/META-INF/pycharm-core.xml
index 9ebe97183f09..1a5e5ffd7ef5 100644
--- a/python/src/META-INF/pycharm-core.xml
+++ b/python/src/META-INF/pycharm-core.xml
@@ -15,12 +15,6 @@
     <xi:fallback/>
   </xi:include>
 
-  <application-components>
-    <component>
-      <implementation-class>com.jetbrains.python.PyCharmInitialConfigurator</implementation-class>
-      <headless-implementation-class/>
-    </component>
-  </application-components>
   <project-components>
     <component>
       <implementation-class>com.intellij.internal.statistic.updater.SendStatisticsProjectComponent</implementation-class>