diff --git a/packages/frontend-2/components/header/WorkspaceSwitcher/WorkspaceSwitcher.vue b/packages/frontend-2/components/header/WorkspaceSwitcher/WorkspaceSwitcher.vue
index 4858edfc1..6dd5f0072 100644
--- a/packages/frontend-2/components/header/WorkspaceSwitcher/WorkspaceSwitcher.vue
+++ b/packages/frontend-2/components/header/WorkspaceSwitcher/WorkspaceSwitcher.vue
@@ -54,6 +54,7 @@
               title="Workspaces"
               :icon-click="isGuest ? undefined : handlePlusClick"
               icon-text="Create workspace"
+              always-show-icon
             >
               <HeaderWorkspaceSwitcherItem
                 v-for="item in workspaces"
diff --git a/packages/ui-components/src/components/layout/sidebar/menu/group/Group.vue b/packages/ui-components/src/components/layout/sidebar/menu/group/Group.vue
index ce9e18c6f..5cb350fd6 100644
--- a/packages/ui-components/src/components/layout/sidebar/menu/group/Group.vue
+++ b/packages/ui-components/src/components/layout/sidebar/menu/group/Group.vue
@@ -41,8 +41,8 @@
       <button
         v-if="iconClick"
         v-tippy="iconText ? iconText : undefined"
-        class="hidden group-hover:flex p-1 shrink-0 hover:bg-primary-muted rounded text-foreground-2"
-        :class="noHover ? '' : 'mr-2'"
+        class="group-hover:flex p-1 shrink-0 hover:bg-primary-muted rounded text-foreground-2"
+        :class="[noHover ? '' : 'mr-2', alwaysShowIcon ? 'flex' : 'hidden']"
         @click="iconClick"
       >
         <Edit v-if="icon === 'edit'" class="h-4 w-4" />
@@ -74,6 +74,7 @@ defineProps<{
   iconClick?: () => void
   noHover?: boolean
   nested?: boolean
+  alwaysShowIcon?: boolean
 }>()
 
 const isCollapsed = defineModel<boolean>('collapsed')