diff --git a/mods/core/css/tabs.css b/mods/core/css/tabs.css
index 7de4934..250a01b 100644
--- a/mods/core/css/tabs.css
+++ b/mods/core/css/tabs.css
@@ -94,6 +94,8 @@ body,
 #titlebar button {
   color: var(--theme--text);
   -webkit-app-region: no-drag;
+  border: none;
+  background-color: transparent;
 }
 #titlebar .window-buttons-area {
   margin: 0.5em 0.55em 0.5em auto;
@@ -102,10 +104,7 @@ body,
   display: none;
 }
 
-#tabs {
-  margin-top: auto;
-}
-#tabs::before {
+#open-enhancer-menu::before {
   content: '';
   height: 1.25em;
   width: 1.25em;
@@ -115,6 +114,9 @@ body,
   background-image: url('enhancement://core/icons/mac+linux.png');
   background-repeat: no-repeat;
 }
+#tabs {
+  margin-top: auto;
+}
 #tabs .tab {
   display: inline-flex;
   background: var(--theme--main);
diff --git a/mods/core/render.js b/mods/core/render.js
index 0ac5969..5c7b6ab 100644
--- a/mods/core/render.js
+++ b/mods/core/render.js
@@ -42,6 +42,7 @@ module.exports = (store, __exports) => {
         this.$titlebar = null;
         this.$dragging = null;
         this.views = {
+          active: null,
           current: {
             $el: () => this.views.html[this.views.current.id],
             id: 0,
@@ -189,15 +190,19 @@ module.exports = (store, __exports) => {
         this.setState({ tabs: list }, this.focusTab.bind(this));
       }
       focusTab() {
+        if (this.views.active === this.views.current.id) return;
         this.loadListeners();
         this.blurListeners();
         this.focusListeners();
         for (const id in this.views.loaded) {
           if (this.views.loaded.hasOwnProperty(id) && this.views.loaded[id]) {
-            this.views.loaded[id].style.display =
-              id == this.views.current.id && this.state.tabs.get(+id)
-                ? 'flex'
-                : 'none';
+            const selected =
+              id == this.views.current.id && this.state.tabs.get(+id);
+            this.views.loaded[id].style.display = selected ? 'flex' : 'none';
+            if (selected) {
+              this.views.active = this.views.current.id;
+              this.views.loaded[id].focus();
+            }
           }
         }
       }
@@ -216,15 +221,19 @@ module.exports = (store, __exports) => {
         }
       }
       startSearch(isPeekView) {
-        this.setState({
-          searching: true,
-          searchingPeekView: isPeekView,
-        });
-        if (document.activeElement instanceof HTMLElement)
-          document.activeElement.blur();
-        this.$search.focus();
-        notionIpc.sendIndexToSearch(this.$search, 'search:start');
-        notionIpc.sendIndexToNotion(this.$search, 'search:started');
+        this.setState(
+          {
+            searching: true,
+            searchingPeekView: isPeekView,
+          },
+          () => {
+            if (document.activeElement instanceof HTMLElement)
+              document.activeElement.blur();
+            this.$search.focus();
+            notionIpc.sendIndexToSearch(this.$search, 'search:start');
+            notionIpc.sendIndexToNotion(this.$search, 'search:started');
+          }
+        );
       }
       stopSearch() {
         notionIpc.sendIndexToSearch(this.$search, 'search:reset');
@@ -461,6 +470,12 @@ module.exports = (store, __exports) => {
               this.$titlebar = $titlebar;
             },
           },
+          React.createElement('button', {
+            id: 'open-enhancer-menu',
+            onClick: (e) => {
+              electron.ipcRenderer.send('enhancer:open-menu');
+            },
+          }),
           React.createElement(
             'div',
             { id: 'tabs' },
@@ -556,8 +571,9 @@ module.exports = (store, __exports) => {
                   ? 37
                   : 45) * this.state.zoomFactor,
               right: (48 - 24) * this.state.zoomFactor,
-              width: 440 * this.state.zoomFactor,
+              width: 460 * this.state.zoomFactor,
               height: 72 * this.state.zoomFactor,
+              zIndex: 99,
             },
           },
           React.createElement('webview', {
diff --git a/pkg/apply.js b/pkg/apply.js
index efb34ff..d773356 100644
--- a/pkg/apply.js
+++ b/pkg/apply.js
@@ -122,7 +122,7 @@ module.exports = async function ({ overwrite_version, friendly_errors } = {}) {
                 'Notion'
               )}" ${
                 err.dest
-                  ? `and "sudo chmod -R a+wr ${err.dest.replace(
+                  ? `and/or "sudo chmod -R a+wr ${err.dest.replace(
                       'Notion.app',
                       'Notion'
                     )}"`
diff --git a/pkg/remove.js b/pkg/remove.js
index 41cea0d..de15650 100644
--- a/pkg/remove.js
+++ b/pkg/remove.js
@@ -124,7 +124,7 @@ module.exports = async function ({
                 'Notion'
               )}" ${
                 err.dest
-                  ? `and "sudo chmod -R a+wr ${err.dest.replace(
+                  ? `and/or "sudo chmod -R a+wr ${err.dest.replace(
                       'Notion.app',
                       'Notion'
                     )}"`