diff --git a/src/browser/base/content/zen-keysets.inc.xhtml b/src/browser/base/content/zen-keysets.inc.xhtml
index 66d8a3a32..609b58638 100644
--- a/src/browser/base/content/zen-keysets.inc.xhtml
+++ b/src/browser/base/content/zen-keysets.inc.xhtml
@@ -25,7 +25,7 @@
   <command id="cmd_zenWorkspaceSwitch10" />
 
   <command id="cmd_zenOpenZenThemePicker" />
-  <command id="cmd_zenChangeWorkspaceTabColor" />
+  <command id="cmd_zenChangeWorkspaceTab" />
   <command id="cmd_zenToggleTabsOnRight" />
 
   <command id="cmd_zenReplacePinnedUrlWithCurrent" />
diff --git a/src/browser/base/content/zen-sets.js b/src/browser/base/content/zen-sets.js
index f808ef087..248ba81f1 100644
--- a/src/browser/base/content/zen-sets.js
+++ b/src/browser/base/content/zen-sets.js
@@ -53,7 +53,7 @@ document.addEventListener(
             gZenThemePicker.openThemePicker(event);
             break;
           case 'cmd_zenChangeWorkspaceTab':
-            ZenWorkspaces.changeTabWorkspace(event.target.getAttribute('zen-workspace-id'));
+            ZenWorkspaces.changeTabWorkspace(event.sourceEvent.target.getAttribute('zen-workspace-id'));
             break;
           case 'cmd_zenToggleTabsOnRight':
             gZenVerticalTabsManager.toggleTabsOnRight();
diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index af1f0aa32..195663931 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -1898,6 +1898,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
       const menuItem = document.createXULElement('menuitem');
       menuItem.setAttribute('label', workspace.name);
       menuItem.setAttribute('zen-workspace-id', workspace.uuid);
+      menuItem.setAttribute('command', 'cmd_zenChangeWorkspaceTab');
 
       if (workspace.uuid === activeWorkspace.uuid) {
         menuItem.setAttribute('disabled', 'true');
@@ -2208,7 +2209,6 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
 
     const menuPopup = document.createXULElement('menupopup');
     menuPopup.setAttribute('id', 'context-zen-change-workspace-tab-menu-popup');
-    menuPopup.setAttribute('command', 'cmd_zenChangeWorkspaceTab');
 
     menu.appendChild(menuPopup);