diff --git a/views/index.jade b/views/index.jade
index e1f8de7d00..43fa369ce4 100644
--- a/views/index.jade
+++ b/views/index.jade
@@ -82,7 +82,9 @@ html
         li(ng-repeat='error in _flash.error') {{error}}
 
       //if they hide the header, we still need user-menu visible
-      app:settings:menu(ng-show='user.preferences.hideHeader')
+      div(ng-if='user.preferences.hideHeader')
+        include ./shared/header/menu
+
       .exp-chart(ng-show='page.charts.exp')
 
       #main(ng-view)
diff --git a/views/options/settings.jade b/views/options/settings.jade
index 090af28120..4db36df884 100644
--- a/views/options/settings.jade
+++ b/views/options/settings.jade
@@ -11,8 +11,8 @@
         | Habit defaults to check and reset your dailies at midnight in your time zone each day. You can customize the hour here (enter a number between 0 and 24).
     hr
     h4 Misc
-    button.btn(ng-hide='user.preferences.hideHeader', ng-click='set("user.preferences.hideHeader",true)') Show Header
-    button.btn(ng-show='user.preferences.hideHeader', ng-click='set("user.preferences.hideHeader",false)') Hide Header
+    button.btn(ng-hide='user.preferences.hideHeader', ng-click='set("preferences.hideHeader",true)') Hide Header
+    button.btn(ng-show='user.preferences.hideHeader', ng-click='set("preferences.hideHeader",false)') Show Header
     div(ng-show='user.auth.local')
       hr
       h4 Change Password
diff --git a/views/shared/header/header.jade b/views/shared/header/header.jade
index cc26603b6b..a847d2fa6e 100644
--- a/views/shared/header/header.jade
+++ b/views/shared/header/header.jade
@@ -1,9 +1,10 @@
 // @TODO ui:connectionAlert
 .header-wrap
   a.label.undo-button(x-bind='click:undo', ng-show='_undo') Undo
-  include menu
+  div(ng-if='!user.preferences.hideHeader')
+    include menu
 
-  header.site-header(ng-class='{hidden: user.preferences.hideHeader}', role='banner', data-partysize='{{party.members.length>1 ? truarr(party.members.length) : 0}}')
+  header.site-header(ng-hide='user.preferences.hideHeader', role='banner', data-partysize='{{party.members.length>1 ? truarr(party.members.length) : 0}}')
     // avatar
     .herobox-wrap.main-herobox(ng-controller='UserAvatarCtrl')
       include avatar