diff --git a/src/public/app/components/note_context.js b/src/public/app/components/note_context.js
index 3df6b206e..c22a87ac6 100644
--- a/src/public/app/components/note_context.js
+++ b/src/public/app/components/note_context.js
@@ -176,9 +176,12 @@ class NoteContext extends Component {
     }
 
     getTabState() {
-        if (!this.notePath && this.hoistedNoteId === 'root') {
+        if (this.hoistedNoteId !== 'root') {
             // keeping empty hoisted tab is esp. important for mobile (e.g. opened launcher config)
-            return null;
+
+            if (!this.notePath && this.getSubContexts().length === 0) {
+                return null;
+            }
         }
 
         return {