diff --git a/packages/frontend/@n8n/design-system/src/components/N8nCommandBar/CommandBar.vue b/packages/frontend/@n8n/design-system/src/components/N8nCommandBar/CommandBar.vue
index d09885b639d..eadaf3e0813 100644
--- a/packages/frontend/@n8n/design-system/src/components/N8nCommandBar/CommandBar.vue
+++ b/packages/frontend/@n8n/design-system/src/components/N8nCommandBar/CommandBar.vue
@@ -334,7 +334,7 @@ onUnmounted(() => {
 	background: var(--color--background--light-3);
 	border: var(--border);
 	border-radius: var(--radius);
-	box-shadow: var(--shadow-command-bar);
+	box-shadow: var(--command-bar--shadow);
 
 	width: 100%;
 	max-width: 700px;
diff --git a/packages/frontend/@n8n/design-system/src/components/N8nCommandBar/CommandBarItem.vue b/packages/frontend/@n8n/design-system/src/components/N8nCommandBar/CommandBarItem.vue
index fe7199cb564..a49a8a0c4c3 100644
--- a/packages/frontend/@n8n/design-system/src/components/N8nCommandBar/CommandBarItem.vue
+++ b/packages/frontend/@n8n/design-system/src/components/N8nCommandBar/CommandBarItem.vue
@@ -73,11 +73,11 @@ const handleMouseLeave = () => {
 	transition: background-color 0.1s ease;
 
 	&:hover {
-		background-color: var(--color-command-bar-item-hover-background);
+		background-color: var(--command-bar-item--color--background--hover);
 	}
 
 	&.selected {
-		background-color: var(--color-command-bar-item-hover-background);
+		background-color: var(--command-bar-item--color--background--hover);
 	}
 }
 
diff --git a/packages/frontend/@n8n/design-system/src/css/_tokens.dark.scss b/packages/frontend/@n8n/design-system/src/css/_tokens.dark.scss
index 57412efd23e..301d03211b7 100644
--- a/packages/frontend/@n8n/design-system/src/css/_tokens.dark.scss
+++ b/packages/frontend/@n8n/design-system/src/css/_tokens.dark.scss
@@ -530,8 +530,8 @@
 	/* Ag Grid */
 	--grid--row--color--background--selected: var(--p--color--secondary-720);
 
-	--color-command-bar-item-hover-background: var(--color--background--light-1);
-	--shadow-command-bar: 0 15px 45px 0 hsla(0, 0%, 0%, 0.25), 0 5px 10px 0 hsla(0, 0%, 0%, 0.15);
+	--command-bar-item--color--background--hover: var(--color--background--light-1);
+	--command-bar--shadow: 0 15px 45px 0 hsla(0, 0%, 0%, 0.25), 0 5px 10px 0 hsla(0, 0%, 0%, 0.15);
 }
 
 body[data-theme='dark'] {
diff --git a/packages/frontend/@n8n/design-system/src/css/_tokens.scss b/packages/frontend/@n8n/design-system/src/css/_tokens.scss
index cae64146c22..2fc99d720d1 100644
--- a/packages/frontend/@n8n/design-system/src/css/_tokens.scss
+++ b/packages/frontend/@n8n/design-system/src/css/_tokens.scss
@@ -743,8 +743,8 @@
 	--grid--row--color--background--selected: var(--p--color--secondary-070);
 	--grid--cell--border-color--editing: 2px solid var(--color--secondary);
 
-	--color-command-bar-item-hover-background: var(--color--background);
-	--shadow-command-bar: 0 15px 45px 0 hsla(0, 0%, 0%, 0.13), 0 5px 10px 0 hsla(0, 0%, 0%, 0.08);
+	--command-bar-item--color--background--hover: var(--color--background);
+	--command-bar--shadow: 0 15px 45px 0 hsla(0, 0%, 0%, 0.13), 0 5px 10px 0 hsla(0, 0%, 0%, 0.08);
 }
 
 :root {