diff --git a/CHANGELOG.md b/CHANGELOG.md
index dc61738ff..ffd8d2f3e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,11 +16,14 @@ Fixes:
 
 - On Linux, Mailspring now links against libsecret, resolving intermittent "Identity missing required fields" errors that were caused by the Node bindings to libgnome-keyring's API.
 
+- On Linux, composer and thread windows no longer have a "double window bar".
+
+- On Linux, window menu bars no longer hide until you press the Alt key.
+
 - The .rpm package now requires `libXss`, resolving installation issues for some users.
 
 - Spellchecking on linux now works reliably.
 
-
 ### 1.0.2 (10/6/2017)
 
 Fixes:
diff --git a/app/src/browser/window-launcher.es6 b/app/src/browser/window-launcher.es6
index 89d1ebff0..9ec163377 100644
--- a/app/src/browser/window-launcher.es6
+++ b/app/src/browser/window-launcher.es6
@@ -27,8 +27,8 @@ export default class WindowLauncher {
   }) {
     this.defaultWindowOpts = {
       frame: process.platform !== 'darwin',
+      toolbar: process.platform !== 'linux',
       hidden: false,
-      toolbar: true,
       devMode,
       safeMode,
       resizable: true,
diff --git a/app/src/browser/window-manager.es6 b/app/src/browser/window-manager.es6
index 2d96c88b2..fbcca7d78 100644
--- a/app/src/browser/window-manager.es6
+++ b/app/src/browser/window-manager.es6
@@ -205,6 +205,7 @@ export default class WindowManager {
       windowKey: WindowManager.MAIN_WINDOW,
       windowType: WindowManager.MAIN_WINDOW,
       title: 'Message Viewer',
+      toolbar: true,
       neverClose: true,
       bootstrapScript: require.resolve('../window-bootstrap'),
       mainWindow: true,