diff --git a/src/public/app/components/entrypoints.js b/src/public/app/components/entrypoints.js
index 1b35cc183..92550b206 100644
--- a/src/public/app/components/entrypoints.js
+++ b/src/public/app/components/entrypoints.js
@@ -86,11 +86,7 @@ export default class Entrypoints extends Component {
             if (win.isFullScreenable()) {
                 win.setFullScreen(!win.isFullScreen());
             }
-        }
-        else {
-            // outside of electron this is handled by the browser
-            this.$widget.find(".toggle-fullscreen-button").hide();
-        }
+        } // outside of electron this is handled by the browser
     }
 
     reloadFrontendAppCommand() {
diff --git a/src/public/app/widgets/attribute_widgets/attribute_detail.js b/src/public/app/widgets/attribute_widgets/attribute_detail.js
index ef708250b..c3f266077 100644
--- a/src/public/app/widgets/attribute_widgets/attribute_detail.js
+++ b/src/public/app/widgets/attribute_widgets/attribute_detail.js
@@ -238,7 +238,8 @@ const ATTR_HELP = {
         "template": "This note will appear in the selection of available template when creating new note",
         "toc": "<code>#toc</code> or <code>#toc=show</code> will force the Table of Contents to be shown, <code>#toc=hide</code> will force hiding it. If the label doesn't exist, the global setting is observed",
         "color": "defines color of the note in note tree, links etc. Use any valid CSS color value like 'red' or #a13d5f",
-        "keyboardShortcut": "Defines a keyboard shortcut which will immediately jump to this note. Example: 'ctrl+alt+e'. Requires frontend reload for the change to take effect."
+        "keyboardShortcut": "Defines a keyboard shortcut which will immediately jump to this note. Example: 'ctrl+alt+e'. Requires frontend reload for the change to take effect.",
+        "keepCurrentHoisting": "Opening this link won't change hoisting even if the note is not displayable in the current hoisted subtree."
     },
     "relation": {
         "runOnNoteCreation": "executes when note is created on backend. Use this relation if you want to run the script for all notes created under a specific subtree. In that case, create it on the subtree root note and make it inheritable. A new note created within the subtree (any depth) will trigger the script.",
diff --git a/src/public/app/widgets/buttons/global_menu.js b/src/public/app/widgets/buttons/global_menu.js
index e1315066b..1f8594c03 100644
--- a/src/public/app/widgets/buttons/global_menu.js
+++ b/src/public/app/widgets/buttons/global_menu.js
@@ -135,12 +135,6 @@ const TPL = `
             </div>
         </span>
 
-        <li class="dropdown-item" data-trigger-command="toggleFullscreen">
-            <span class="bx bx-empty"></span>
-            Toggle fullscreen
-            <kbd ></kbd>
-        </li>
-        
         <li class="dropdown-item" data-trigger-command="showLaunchBarSubtree">
             <span class="bx bx-sidebar"></span>
             Configure launchbar
diff --git a/src/services/special_notes.js b/src/services/special_notes.js
index da272cfe0..a8785492f 100644
--- a/src/services/special_notes.js
+++ b/src/services/special_notes.js
@@ -42,6 +42,7 @@ function createSqlConsole() {
 
     note.setLabel("sqlConsole", dateUtils.localNowDate());
     note.setLabel('iconClass', 'bx bx-data');
+    note.setLabel('keepCurrentHoisting');
 
     return note;
 }
@@ -75,6 +76,7 @@ function createSearchNote(searchString, ancestorNoteId) {
     });
 
     note.setLabel('searchString', searchString);
+    note.setLabel('keepCurrentHoisting');
 
     if (ancestorNoteId) {
         note.setRelation('ancestor', ancestorNoteId);