diff --git a/app/scripts/views/app-view.js b/app/scripts/views/app-view.js
index a3f59268..2aa64935 100644
--- a/app/scripts/views/app-view.js
+++ b/app/scripts/views/app-view.js
@@ -105,6 +105,9 @@ const AppView = Backbone.View.extend({
         if (getBrowserCssClass) {
             this.$el.addClass(getBrowserCssClass);
         }
+        if (this.titlebarStyle !== 'default') {
+            this.$el.addClass('titlebar-' + this.titlebarStyle);
+        }
     },
 
     render: function () {
diff --git a/app/styles/areas/_app.scss b/app/styles/areas/_app.scss
index 620ab8d3..538828d0 100644
--- a/app/styles/areas/_app.scss
+++ b/app/styles/areas/_app.scss
@@ -5,7 +5,7 @@
   flex-direction: column;
   justify-content: flex-start;
 
-  &--titlebar-style-hidden-inset {
+  .titlebar-hidden & {
     -webkit-app-region: drag;
   }
 
@@ -37,11 +37,11 @@
       }
     }
     transition: padding-top 150ms;
-    .app--titlebar-style-hidden & {
-      padding-top: 24px;
+    .titlebar-hidden & {
+      padding-top: $titlebar-padding-small;
     }
-    .app--titlebar-style-hidden-inset & {
-      padding-top: 40px;
+    .titlebar-hidden-inset & {
+      padding-top: $titlebar-padding-large;
     }
     .fullscreen .app & {
       padding-top: 0;
diff --git a/app/styles/areas/_auto-type.scss b/app/styles/areas/_auto-type.scss
index 8b5cf7f0..3c53cc5f 100644
--- a/app/styles/areas/_auto-type.scss
+++ b/app/styles/areas/_auto-type.scss
@@ -11,6 +11,13 @@
   opacity: 1;
   padding: $base-padding;
 
+  .titlebar-hidden & {
+    padding-top: $titlebar-padding-small;
+  }
+  .titlebar-hidden-inset & {
+    padding-top: $titlebar-padding-large;
+  }
+
   &__header {
     display: flex;
     &-text {
diff --git a/app/styles/base/_variables.scss b/app/styles/base/_variables.scss
index 667ab264..cd9bb045 100644
--- a/app/styles/base/_variables.scss
+++ b/app/styles/base/_variables.scss
@@ -26,6 +26,8 @@ $medium-padding: $medium-padding-v $medium-padding-h;
 $base-padding-px: 5px 10px;
 $modal-icon-size: 6em;
 $large-padding: 2em;
+$titlebar-padding-small: 24px;
+$titlebar-padding-large: 40px;
 
 // Borders
 @function base-border() { @return 1px solid th(base-border-color); };
diff --git a/app/templates/app.hbs b/app/templates/app.hbs
index 4f7547fa..67a65b9f 100644
--- a/app/templates/app.hbs
+++ b/app/templates/app.hbs
@@ -1,4 +1,4 @@
-<div class="app {{#ifneq titlebarStyle 'default'}}app--titlebar-style-{{titlebarStyle}}{{/ifneq}}">
+<div class="app">
     {{#if beta}}<div class="app__beta"><i class="fa fa-exclamation-triangle"></i> {{res 'appBeta'}}</div>{{/if}}
     {{#ifeq titlebarStyle 'hidden'}}<div class="app__titlebar-drag"></div>{{/ifeq}}
     <div class="app__body">
diff --git a/release-notes.md b/release-notes.md
index 60ebc767..9d00c4fa 100644
--- a/release-notes.md
+++ b/release-notes.md
@@ -3,6 +3,7 @@ Release notes
 ##### v1.5.3 (TBD)
 `-` fix #638: password generator drag issues  
 `-` fix #636: broken layout in edge 15  
+`-` fix #641: fixed mac app layout issues  
 
 ##### v1.5.2 (2017-05-25)
 `-` fix #633: template ids issues