diff --git a/src/zen/common/ZenUIManager.mjs b/src/zen/common/ZenUIManager.mjs
index 1d3a702e1..9f99817a3 100644
--- a/src/zen/common/ZenUIManager.mjs
+++ b/src/zen/common/ZenUIManager.mjs
@@ -1094,7 +1094,7 @@ var gZenVerticalTabsManager = {
       this._tabEdited = null;
       return;
     }
-    event.stopPropagation();
+    event.stopPropagation?.();
     document.documentElement.setAttribute('zen-renaming-tab', 'true');
     const label = isTab ? this._tabEdited.querySelector('.tab-label-container') : this._tabEdited;
     label.classList.add('tab-label-container-editing');
diff --git a/src/zen/common/styles/zen-single-components.css b/src/zen/common/styles/zen-single-components.css
index 25fcfd754..9371bb0a9 100644
--- a/src/zen/common/styles/zen-single-components.css
+++ b/src/zen/common/styles/zen-single-components.css
@@ -55,6 +55,10 @@ body > #confetti {
     display: none;
   }
 
+  #PanelUI-zen-emojis-picker-search {
+    padding: 4px;
+  }
+
   #PanelUI-zen-emojis-picker-list {
     flex-wrap: wrap;
     max-height: 265px;
@@ -63,9 +67,11 @@ body > #confetti {
 
     gap: 5px;
     display: grid;
-    grid-template-columns: repeat(auto-fill, minmax(22px, 1fr));
+    grid-template-columns: repeat(auto-fill, minmax(28px, 1fr));
 
     .zen-emojis-picker-emoji {
+      appearance: none;
+      font-size: 14px;
       & image {
         display: none;
       }
diff --git a/src/zen/common/zen-sets.js b/src/zen/common/zen-sets.js
index be80bda1f..bbd08558a 100644
--- a/src/zen/common/zen-sets.js
+++ b/src/zen/common/zen-sets.js
@@ -92,7 +92,11 @@ document.addEventListener(
             gZenWorkspaces.contextDeleteWorkspace(event);
             break;
           case 'cmd_zenChangeWorkspaceName':
-            gZenVerticalTabsManager.renameTabStart(event);
+            gZenVerticalTabsManager.renameTabStart({
+              target: gZenWorkspaces.activeWorkspaceIndicator.querySelector(
+                '.zen-current-workspace-indicator-name'
+              ),
+            });
             break;
           case 'cmd_zenChangeWorkspaceIcon':
             gZenWorkspaces.changeWorkspaceIcon();
diff --git a/src/zen/workspaces/zen-workspaces.css b/src/zen/workspaces/zen-workspaces.css
index 19848e4b3..7a6f657f2 100644
--- a/src/zen/workspaces/zen-workspaces.css
+++ b/src/zen/workspaces/zen-workspaces.css
@@ -340,7 +340,7 @@
 
 /* Mark workspaces indicator */
 .zen-current-workspace-indicator {
-  padding: calc(4px + var(--tab-inline-padding) + var(--zen-toolbox-padding));
+  padding: calc(2px + var(--tab-inline-padding) + var(--zen-toolbox-padding));
   font-weight: 600;
   position: relative;
   max-height: var(--zen-workspace-indicator-height);