diff --git a/app/assets/javascripts/app/controllers/footer.js b/app/assets/javascripts/app/controllers/footer.js
index 6491e40dd..d408d1be4 100644
--- a/app/assets/javascripts/app/controllers/footer.js
+++ b/app/assets/javascripts/app/controllers/footer.js
@@ -65,9 +65,12 @@ angular.module('app')
       }
       this.updateOfflineStatus();
 
-      if(this.offline && !passcodeManager.hasPasscode()) {
-        this.showAccountMenu = true;
-      }
+      $rootScope.$on("initial-data-loaded", () => {
+        // If the user has no notes and is offline, show Account menu
+        if(this.offline && modelManager.noteCount() == 0) {
+          this.showAccountMenu = true;
+        }
+      })
 
       this.findErrors = function() {
         this.error = syncManager.syncStatus.error;
diff --git a/app/assets/javascripts/app/services/modelManager.js b/app/assets/javascripts/app/services/modelManager.js
index 6ac250eea..c3f30c207 100644
--- a/app/assets/javascripts/app/services/modelManager.js
+++ b/app/assets/javascripts/app/services/modelManager.js
@@ -30,6 +30,10 @@ class ModelManager extends SFModelManager {
     this.components.length = 0;
   }
 
+  noteCount() {
+    return this.notes.length;
+  }
+
   removeAllItemsFromMemory() {
     for(var item of this.items) {
       item.deleted = true;