diff --git a/src/zen/common/zen-sets.js b/src/zen/common/zen-sets.js
index 529a98f60..78a4cdc50 100644
--- a/src/zen/common/zen-sets.js
+++ b/src/zen/common/zen-sets.js
@@ -115,9 +115,9 @@ document.addEventListener(
               renameFolder: true,
             });
             break;
-          case 'cmd_zenTogglePinTab':
+          case 'cmd_zenTogglePinTab': {
             const currentTab = gBrowser.selectedTab;
-            if (currentTab) {
+            if (currentTab && !currentTab.hasAttribute('zen-empty-tab')) {
               if (currentTab.pinned) {
                 gBrowser.unpinTab(currentTab);
               } else {
@@ -125,6 +125,7 @@ document.addEventListener(
               }
             }
             break;
+          }
           default:
             gZenGlanceManager.handleMainCommandSet(event);
             if (event.target.id.startsWith('cmd_zenWorkspaceSwitch')) {
diff --git a/src/zen/kbs/ZenKeyboardShortcuts.mjs b/src/zen/kbs/ZenKeyboardShortcuts.mjs
index c9e4cfbdb..0d4fe20b5 100644
--- a/src/zen/kbs/ZenKeyboardShortcuts.mjs
+++ b/src/zen/kbs/ZenKeyboardShortcuts.mjs
@@ -133,8 +133,8 @@ const VALID_SHORTCUT_GROUPS = [
   ZEN_COMPACT_MODE_SHORTCUTS_GROUP,
   ZEN_WORKSPACE_SHORTCUTS_GROUP,
   ZEN_SPLIT_VIEW_SHORTCUTS_GROUP,
-  ...Object.keys(defaultKeyboardGroups),
   ZEN_OTHER_SHORTCUTS_GROUP,
+  ...Object.keys(defaultKeyboardGroups),
   'other',
 ];
 
@@ -847,8 +847,8 @@ class nsZenKeyboardShortcutsVersioner {
     out = out.filter(
       (shortcut) =>
         shortcut.getAction?.() !== 'Browser:OpenFile' &&
-        shortcut.getAction?.() !== 'Browser:BookmarkAllTabs' &&
-        shortcut.getAction?.() !== 'key_stop'
+        shortcut.getID?.() !== 'bookmarkAllTabsKb' &&
+        shortcut.getID?.() !== 'key_stop'
     );
 
     return out;