diff --git a/python/ide/src/com/jetbrains/python/newProject/PythonNewDirectoryProjectAction.java b/python/ide/src/com/jetbrains/python/newProject/PythonNewDirectoryProjectAction.java
index 16f10c7a0591..4496b6d4d854 100644
--- a/python/ide/src/com/jetbrains/python/newProject/PythonNewDirectoryProjectAction.java
+++ b/python/ide/src/com/jetbrains/python/newProject/PythonNewDirectoryProjectAction.java
@@ -17,7 +17,6 @@ package com.jetbrains.python.newProject;
 
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.CommonDataKeys;
-import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.progress.ProcessCanceledException;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.project.ProjectManager;
diff --git a/python/ide/src/com/jetbrains/python/newProject/PythonNewDirectoryProjectDialog.java b/python/ide/src/com/jetbrains/python/newProject/PythonNewDirectoryProjectDialog.java
index ecdb29dee04b..4b05b73434e1 100644
--- a/python/ide/src/com/jetbrains/python/newProject/PythonNewDirectoryProjectDialog.java
+++ b/python/ide/src/com/jetbrains/python/newProject/PythonNewDirectoryProjectDialog.java
@@ -16,10 +16,12 @@
 package com.jetbrains.python.newProject;
 
 import com.intellij.facet.ui.ValidationResult;
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.progress.ProcessCanceledException;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.projectRoots.Sdk;
+import com.intellij.openapi.roots.ModuleRootModificationUtil;
 import com.intellij.openapi.util.Condition;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.platform.DirectoryProjectGenerator;
@@ -172,21 +174,29 @@ public class PythonNewDirectoryProjectDialog extends NewDirectoryProjectDialog {
           return manager.showRemoteProjectSettingsDialog(baseDir, (RemoteSdkData)getSdk().getSdkAdditionalData());
         }
         else {
-          return null;
+          return new PyNewProjectSettings();
         }
       }
 
       @Override
-      public void generateProject(@NotNull Project project,
+      public void generateProject(@NotNull final Project project,
                                   @NotNull VirtualFile baseDir,
-                                  Object settings,
-                                  @NotNull Module module) {
+                                  final Object settings,
+                                  @NotNull final Module module) {
         if (settings instanceof RemoteProjectSettings) {
           PythonRemoteInterpreterManager manager = PythonRemoteInterpreterManager.getInstance();
           assert manager != null;
           manager.createDeployment(project, baseDir, (RemoteProjectSettings)settings,
                                    (RemoteSdkData)getSdk().getSdkAdditionalData());
         }
+        else if (settings instanceof PyNewProjectSettings) {
+          ApplicationManager.getApplication().runWriteAction(new Runnable() {
+            @Override
+            public void run() {
+              ModuleRootModificationUtil.setModuleSdk(module, ((PyNewProjectSettings)settings).getSdk());
+            }
+          });
+        }
       }
 
       @NotNull