diff --git a/app/menu.js b/app/menu.js
index ce3111258f..e021ee6c2d 100644
--- a/app/menu.js
+++ b/app/menu.js
@@ -245,8 +245,9 @@ function updateForMac(template, messages, options) {
   );
 
   // Replace Window menu
+  const windowIndex = options.includeSetup ? 4 : 3;
   // eslint-disable-next-line no-param-reassign
-  template[3].submenu = [
+  template[windowIndex].submenu = [
     {
       accelerator: 'CmdOrCtrl+W',
       role: 'close',
diff --git a/package.json b/package.json
index af82f92bb5..fb5ba745a3 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "productName": "Signal",
   "description": "Private messaging from your desktop",
   "repository": "https://github.com/signalapp/Signal-Desktop.git",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "license": "GPL-3.0",
   "author": {
     "name": "Open Whisper Systems",
diff --git a/stylesheets/_global.scss b/stylesheets/_global.scss
index 296f73e8d8..9b4d7290ee 100644
--- a/stylesheets/_global.scss
+++ b/stylesheets/_global.scss
@@ -610,7 +610,6 @@ input[type=text], input[type=search], textarea {
 }
 
 .full-screen-flow {
-  z-index: 1000;
   position: absolute;
   left: 0;
   right: 0;