diff --git a/src/api/Api.js b/src/api/Api.js
index fb29a53e..4c571b10 100644
--- a/src/api/Api.js
+++ b/src/api/Api.js
@@ -688,6 +688,14 @@ export default class Project extends EventEmitter {
         });
       }
 
+      showDialog(ProgressDialog, {
+        title: "Generating Project Screenshot",
+        message: "Generating project screenshot..."
+      });
+
+      // Wait for 5ms so that the ProgressDialog shows up.
+      await new Promise(resolve => setTimeout(resolve, 5));
+
       // Take a screenshot of the scene from the current camera position to use as the thumbnail
       const { blob: screenshotBlob, cameraTransform: screenshotCameraTransform } = await editor.takeScreenshot();
       screenshotUrl = URL.createObjectURL(screenshotBlob);
diff --git a/src/ui/EditorContainer.js b/src/ui/EditorContainer.js
index 48d02ef8..de6abf06 100644
--- a/src/ui/EditorContainer.js
+++ b/src/ui/EditorContainer.js
@@ -537,6 +537,14 @@ class EditorContainer extends Component {
   async createProject() {
     const { editor, parentSceneId } = this.state;
 
+    this.showDialog(ProgressDialog, {
+      title: "Generating Project Screenshot",
+      message: "Generating project screenshot..."
+    });
+
+    // Wait for 5ms so that the ProgressDialog shows up.
+    await new Promise(resolve => setTimeout(resolve, 5));
+
     const { blob } = await editor.takeScreenshot(512, 320);
 
     const result = await new Promise(resolve => {
@@ -548,42 +556,45 @@ class EditorContainer extends Component {
       });
     });
 
-    if (result) {
-      const abortController = new AbortController();
-
-      this.showDialog(ProgressDialog, {
-        title: "Saving Project",
-        message: "Saving project...",
-        cancelable: true,
-        onCancel: () => {
-          abortController.abort();
-          this.hideDialog();
-        }
-      });
-
-      editor.setProperty(editor.scene, "name", result.name, false);
-      editor.scene.setMetadata({ name: result.name });
-
-      const project = await this.props.api.createProject(
-        editor.scene,
-        parentSceneId,
-        blob,
-        abortController.signal,
-        this.showDialog,
-        this.hideDialog
-      );
-
-      editor.sceneModified = false;
-
-      this.updateModifiedState(() => {
-        this.setState({ creatingProject: true, project }, () => {
-          this.props.history.replace(`/projects/${project.project_id}`);
-          this.setState({ creatingProject: false });
-        });
-      });
-
-      return project;
+    if (!result) {
+      this.hideDialog();
+      return null;
     }
+
+    const abortController = new AbortController();
+
+    this.showDialog(ProgressDialog, {
+      title: "Saving Project",
+      message: "Saving project...",
+      cancelable: true,
+      onCancel: () => {
+        abortController.abort();
+        this.hideDialog();
+      }
+    });
+
+    editor.setProperty(editor.scene, "name", result.name, false);
+    editor.scene.setMetadata({ name: result.name });
+
+    const project = await this.props.api.createProject(
+      editor.scene,
+      parentSceneId,
+      blob,
+      abortController.signal,
+      this.showDialog,
+      this.hideDialog
+    );
+
+    editor.sceneModified = false;
+
+    this.updateModifiedState(() => {
+      this.setState({ creatingProject: true, project }, () => {
+        this.props.history.replace(`/projects/${project.project_id}`);
+        this.setState({ creatingProject: false });
+      });
+    });
+
+    return project;
   }
 
   onNewProject = async () => {
@@ -792,6 +803,8 @@ class EditorContainer extends Component {
   };
 
   onPublishProject = async () => {
+    console.log("onPublishProject");
+
     trackEvent("Project Publish Started");
 
     try {
@@ -799,6 +812,7 @@ class EditorContainer extends Component {
       let project = this.state.project;
 
       if (!project) {
+        console.log("beforeCreateProject");
         project = await this.createProject();
       }