diff --git a/scripthaus.md b/scripthaus.md
index 11f97a7d8..8a366f85d 100644
--- a/scripthaus.md
+++ b/scripthaus.md
@@ -80,7 +80,7 @@ open out/Prompt-darwin-x64/Prompt.app
 DMG_VERSION=$(node -e 'console.log(require("./version.js"))')
 DMG_NAME="prompt-macos-x86-${DMG_VERSION}.dmg"
 rm *.dmg
-../../create-dmg/create-dmg/create-dmg \
+/Users/mike/work/gopath/src/github.com/create-dmg/create-dmg/create-dmg \
   --volname "Prompt" \
   --window-pos 200 120 \
   --window-size 600 300 \
diff --git a/src/model.ts b/src/model.ts
index bbfd2db5a..6f51a8484 100644
--- a/src/model.ts
+++ b/src/model.ts
@@ -3333,15 +3333,17 @@ class CommandRunner {
         GlobalModel.submitCommand("screen", "set", null, {"focus": focusVal, "nohist": "1"}, false);
     }
 
-    screenSetSettings(settings : {tabcolor? : string, name? : string}) : void {
+    screenSetSettings(screenId : string, settings : {tabcolor? : string, name? : string}) : void {
         let kwargs = Object.assign({}, settings);
         kwargs["nohist"] = "1";
+        kwargs["screen"] = screenId;
         GlobalModel.submitCommand("screen", "set", null, kwargs, true);
     }
 
-    sessionSetSettings(settings : {name? : string}) : void {
+    sessionSetSettings(sessionId : string, settings : {name? : string}) : void {
         let kwargs = Object.assign({}, settings);
         kwargs["nohist"] = "1";
+        kwargs["session"] = sessionId;
         GlobalModel.submitCommand("session", "set", null, kwargs, true);
     }
 
diff --git a/src/settings.tsx b/src/settings.tsx
index 18fe788e5..6e22ec8f4 100644
--- a/src/settings.tsx
+++ b/src/settings.tsx
@@ -56,7 +56,7 @@ class ScreenSettingsModal extends React.Component<{sessionId : string, screenId
             settings.name = this.tempName.get();
         }
         if (Object.keys(settings).length > 0) {
-            GlobalCommandRunner.screenSetSettings(settings);
+            GlobalCommandRunner.screenSetSettings(this.props.screenId, settings);
         }
         if (this.tempArchived.get() != screen.archived.get()) {
             GlobalCommandRunner.screenArchive(screen.screenId, this.tempArchived.get());
@@ -181,7 +181,7 @@ class SessionSettingsModal extends React.Component<{sessionId : string}, {}> {
     handleOK() : void {
         mobx.action(() => {
             GlobalModel.sessionSettingsModal.set(null);
-            GlobalCommandRunner.sessionSetSettings({
+            GlobalCommandRunner.sessionSetSettings(this.props.sessionId, {
                 "name": this.tempName.get(),
             });
         })();