diff --git a/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav.test.tsx.snap b/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav.test.tsx.snap
index b732d2904e22..1dc9f51468ed 100644
--- a/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav.test.tsx.snap
+++ b/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav.test.tsx.snap
@@ -422,55 +422,6 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
           <div
             className="euiFlexItem eui-yScroll"
           >
-            <EuiCollapsibleNavGroup>
-              <div
-                className="euiCollapsibleNavGroup"
-                id="mockId"
-              >
-                <div
-                  className="euiCollapsibleNavGroup__children"
-                >
-                  <EuiFlexGroup>
-                    <div
-                      className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
-                    >
-                      <EuiFlexItem>
-                        <div
-                          className="euiFlexItem"
-                        >
-                          <EuiIcon
-                            size="l"
-                            type="logoOpenSearch"
-                          >
-                            <span
-                              data-euiicon-type="logoOpenSearch"
-                              size="l"
-                            />
-                          </EuiIcon>
-                        </div>
-                      </EuiFlexItem>
-                      <EuiFlexItem>
-                        <div
-                          className="euiFlexItem"
-                        >
-                          <EuiText>
-                            <div
-                              className="euiText euiText--medium"
-                            >
-                              <strong>
-                                 
-                                OpenSearch Dashboards
-                                 
-                              </strong>
-                            </div>
-                          </EuiText>
-                        </div>
-                      </EuiFlexItem>
-                    </div>
-                  </EuiFlexGroup>
-                </div>
-              </div>
-            </EuiCollapsibleNavGroup>
             <EuiCollapsibleNavGroup
               data-test-opensearch-logo="clock"
               data-test-subj="collapsibleNavGroup-recentlyVisited"
@@ -2695,55 +2646,6 @@ exports[`CollapsibleNav renders the default nav 3`] = `
           <div
             className="euiFlexItem eui-yScroll"
           >
-            <EuiCollapsibleNavGroup>
-              <div
-                className="euiCollapsibleNavGroup"
-                id="mockId"
-              >
-                <div
-                  className="euiCollapsibleNavGroup__children"
-                >
-                  <EuiFlexGroup>
-                    <div
-                      className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
-                    >
-                      <EuiFlexItem>
-                        <div
-                          className="euiFlexItem"
-                        >
-                          <EuiIcon
-                            size="l"
-                            type="logoOpenSearch"
-                          >
-                            <span
-                              data-euiicon-type="logoOpenSearch"
-                              size="l"
-                            />
-                          </EuiIcon>
-                        </div>
-                      </EuiFlexItem>
-                      <EuiFlexItem>
-                        <div
-                          className="euiFlexItem"
-                        >
-                          <EuiText>
-                            <div
-                              className="euiText euiText--medium"
-                            >
-                              <strong>
-                                 
-                                OpenSearch Dashboards
-                                 
-                              </strong>
-                            </div>
-                          </EuiText>
-                        </div>
-                      </EuiFlexItem>
-                    </div>
-                  </EuiFlexGroup>
-                </div>
-              </div>
-            </EuiCollapsibleNavGroup>
             <EuiCollapsibleNavGroup
               data-test-opensearch-logo="clock"
               data-test-subj="collapsibleNavGroup-recentlyVisited"
@@ -3405,55 +3307,6 @@ exports[`CollapsibleNav with custom branding renders the nav bar in dark mode 1`
           <div
             className="euiFlexItem eui-yScroll"
           >
-            <EuiCollapsibleNavGroup>
-              <div
-                className="euiCollapsibleNavGroup"
-                id="mockId"
-              >
-                <div
-                  className="euiCollapsibleNavGroup__children"
-                >
-                  <EuiFlexGroup>
-                    <div
-                      className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
-                    >
-                      <EuiFlexItem>
-                        <div
-                          className="euiFlexItem"
-                        >
-                          <EuiIcon
-                            size="l"
-                            type="logoOpenSearch"
-                          >
-                            <span
-                              data-euiicon-type="logoOpenSearch"
-                              size="l"
-                            />
-                          </EuiIcon>
-                        </div>
-                      </EuiFlexItem>
-                      <EuiFlexItem>
-                        <div
-                          className="euiFlexItem"
-                        >
-                          <EuiText>
-                            <div
-                              className="euiText euiText--medium"
-                            >
-                              <strong>
-                                 
-                                OpenSearch Dashboards
-                                 
-                              </strong>
-                            </div>
-                          </EuiText>
-                        </div>
-                      </EuiFlexItem>
-                    </div>
-                  </EuiFlexGroup>
-                </div>
-              </div>
-            </EuiCollapsibleNavGroup>
             <EuiCollapsibleNavGroup
               data-test-opensearch-logo="clock"
               data-test-subj="collapsibleNavGroup-recentlyVisited"
@@ -4549,55 +4402,6 @@ exports[`CollapsibleNav with custom branding renders the nav bar in default mode
           <div
             className="euiFlexItem eui-yScroll"
           >
-            <EuiCollapsibleNavGroup>
-              <div
-                className="euiCollapsibleNavGroup"
-                id="mockId"
-              >
-                <div
-                  className="euiCollapsibleNavGroup__children"
-                >
-                  <EuiFlexGroup>
-                    <div
-                      className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
-                    >
-                      <EuiFlexItem>
-                        <div
-                          className="euiFlexItem"
-                        >
-                          <EuiIcon
-                            size="l"
-                            type="logoOpenSearch"
-                          >
-                            <span
-                              data-euiicon-type="logoOpenSearch"
-                              size="l"
-                            />
-                          </EuiIcon>
-                        </div>
-                      </EuiFlexItem>
-                      <EuiFlexItem>
-                        <div
-                          className="euiFlexItem"
-                        >
-                          <EuiText>
-                            <div
-                              className="euiText euiText--medium"
-                            >
-                              <strong>
-                                 
-                                OpenSearch Dashboards
-                                 
-                              </strong>
-                            </div>
-                          </EuiText>
-                        </div>
-                      </EuiFlexItem>
-                    </div>
-                  </EuiFlexGroup>
-                </div>
-              </div>
-            </EuiCollapsibleNavGroup>
             <EuiCollapsibleNavGroup
               data-test-opensearch-logo="clock"
               data-test-subj="collapsibleNavGroup-recentlyVisited"
@@ -5686,55 +5490,6 @@ exports[`CollapsibleNav without custom branding renders the nav bar in dark mode
           <div
             className="euiFlexItem eui-yScroll"
           >
-            <EuiCollapsibleNavGroup>
-              <div
-                className="euiCollapsibleNavGroup"
-                id="mockId"
-              >
-                <div
-                  className="euiCollapsibleNavGroup__children"
-                >
-                  <EuiFlexGroup>
-                    <div
-                      className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
-                    >
-                      <EuiFlexItem>
-                        <div
-                          className="euiFlexItem"
-                        >
-                          <EuiIcon
-                            size="l"
-                            type="logoOpenSearch"
-                          >
-                            <span
-                              data-euiicon-type="logoOpenSearch"
-                              size="l"
-                            />
-                          </EuiIcon>
-                        </div>
-                      </EuiFlexItem>
-                      <EuiFlexItem>
-                        <div
-                          className="euiFlexItem"
-                        >
-                          <EuiText>
-                            <div
-                              className="euiText euiText--medium"
-                            >
-                              <strong>
-                                 
-                                OpenSearch Dashboards
-                                 
-                              </strong>
-                            </div>
-                          </EuiText>
-                        </div>
-                      </EuiFlexItem>
-                    </div>
-                  </EuiFlexGroup>
-                </div>
-              </div>
-            </EuiCollapsibleNavGroup>
             <EuiCollapsibleNavGroup
               data-test-opensearch-logo="clock"
               data-test-subj="collapsibleNavGroup-recentlyVisited"
@@ -6819,55 +6574,6 @@ exports[`CollapsibleNav without custom branding renders the nav bar in default m
           <div
             className="euiFlexItem eui-yScroll"
           >
-            <EuiCollapsibleNavGroup>
-              <div
-                className="euiCollapsibleNavGroup"
-                id="mockId"
-              >
-                <div
-                  className="euiCollapsibleNavGroup__children"
-                >
-                  <EuiFlexGroup>
-                    <div
-                      className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
-                    >
-                      <EuiFlexItem>
-                        <div
-                          className="euiFlexItem"
-                        >
-                          <EuiIcon
-                            size="l"
-                            type="logoOpenSearch"
-                          >
-                            <span
-                              data-euiicon-type="logoOpenSearch"
-                              size="l"
-                            />
-                          </EuiIcon>
-                        </div>
-                      </EuiFlexItem>
-                      <EuiFlexItem>
-                        <div
-                          className="euiFlexItem"
-                        >
-                          <EuiText>
-                            <div
-                              className="euiText euiText--medium"
-                            >
-                              <strong>
-                                 
-                                OpenSearch Dashboards
-                                 
-                              </strong>
-                            </div>
-                          </EuiText>
-                        </div>
-                      </EuiFlexItem>
-                    </div>
-                  </EuiFlexGroup>
-                </div>
-              </div>
-            </EuiCollapsibleNavGroup>
             <EuiCollapsibleNavGroup
               data-test-opensearch-logo="clock"
               data-test-subj="collapsibleNavGroup-recentlyVisited"
diff --git a/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap b/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap
index fe00ffa49f21..837f8d71537e 100644
--- a/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap
+++ b/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap
@@ -6159,55 +6159,6 @@ exports[`Header handles visibility and lock changes 1`] = `
               <div
                 className="euiFlexItem eui-yScroll"
               >
-                <EuiCollapsibleNavGroup>
-                  <div
-                    className="euiCollapsibleNavGroup"
-                    id="mockId"
-                  >
-                    <div
-                      className="euiCollapsibleNavGroup__children"
-                    >
-                      <EuiFlexGroup>
-                        <div
-                          className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
-                        >
-                          <EuiFlexItem>
-                            <div
-                              className="euiFlexItem"
-                            >
-                              <EuiIcon
-                                size="l"
-                                type="logoOpenSearch"
-                              >
-                                <span
-                                  data-euiicon-type="logoOpenSearch"
-                                  size="l"
-                                />
-                              </EuiIcon>
-                            </div>
-                          </EuiFlexItem>
-                          <EuiFlexItem>
-                            <div
-                              className="euiFlexItem"
-                            >
-                              <EuiText>
-                                <div
-                                  className="euiText euiText--medium"
-                                >
-                                  <strong>
-                                     
-                                    OpenSearch Dashboards
-                                     
-                                  </strong>
-                                </div>
-                              </EuiText>
-                            </div>
-                          </EuiFlexItem>
-                        </div>
-                      </EuiFlexGroup>
-                    </div>
-                  </div>
-                </EuiCollapsibleNavGroup>
                 <EuiCollapsibleNavGroup
                   data-test-opensearch-logo="clock"
                   data-test-subj="collapsibleNavGroup-recentlyVisited"
diff --git a/src/core/public/chrome/ui/header/collapsible_nav.tsx b/src/core/public/chrome/ui/header/collapsible_nav.tsx
index a5e6e3b7c092..5bc30961fc5f 100644
--- a/src/core/public/chrome/ui/header/collapsible_nav.tsx
+++ b/src/core/public/chrome/ui/header/collapsible_nav.tsx
@@ -32,13 +32,10 @@ import './collapsible_nav.scss';
 import {
   EuiCollapsibleNav,
   EuiCollapsibleNavGroup,
-  EuiFlexGroup,
   EuiFlexItem,
-  EuiIcon,
   EuiListGroup,
   EuiListGroupItem,
   EuiShowFor,
-  EuiText,
 } from '@elastic/eui';
 import { i18n } from '@osd/i18n';
 import { groupBy, sortBy } from 'lodash';
@@ -185,13 +182,6 @@ export function CollapsibleNav({
     });
   };
 
-  const defaultHeaderName = i18n.translate(
-    'core.ui.primaryNav.workspacePickerMenu.defaultHeaderName',
-    {
-      defaultMessage: 'OpenSearch Dashboards',
-    }
-  );
-
   return (
     <EuiCollapsibleNav
       data-test-subj="collapsibleNav"
@@ -204,24 +194,8 @@ export function CollapsibleNav({
       onClose={closeNav}
       outsideClickCloses={false}
     >
+      {collapsibleNavHeaderRender && collapsibleNavHeaderRender()}
       <EuiFlexItem className="eui-yScroll">
-        {collapsibleNavHeaderRender ? (
-          collapsibleNavHeaderRender()
-        ) : (
-          <EuiCollapsibleNavGroup>
-            <EuiFlexGroup>
-              <EuiFlexItem>
-                <EuiIcon type="logoOpenSearch" size="l" />
-              </EuiFlexItem>
-              <EuiFlexItem>
-                <EuiText>
-                  <strong> {defaultHeaderName} </strong>
-                </EuiText>
-              </EuiFlexItem>
-            </EuiFlexGroup>
-          </EuiCollapsibleNavGroup>
-        )}
-
         {/* merged NavLinks */}
         {mergedNavLinks.map((item, i) => {
           if (typeof item === 'string') {
diff --git a/src/plugins/workspace/public/components/workspace_menu/workspace_menu.tsx b/src/plugins/workspace/public/components/workspace_menu/workspace_menu.tsx
index 921021bc62b0..72919f76d146 100644
--- a/src/plugins/workspace/public/components/workspace_menu/workspace_menu.tsx
+++ b/src/plugins/workspace/public/components/workspace_menu/workspace_menu.tsx
@@ -6,15 +6,7 @@
 import { i18n } from '@osd/i18n';
 import React, { useState } from 'react';
 import { useObservable } from 'react-use';
-import {
-  EuiCollapsibleNavGroup,
-  EuiContextMenu,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiIcon,
-  EuiPopover,
-  EuiText,
-} from '@elastic/eui';
+import { EuiCollapsibleNavGroup, EuiContextMenu, EuiIcon, EuiPopover, EuiText } from '@elastic/eui';
 
 import {
   ApplicationStart,
@@ -139,43 +131,19 @@ export const WorkspaceMenu = ({ basePath, getUrlForApp, workspaces }: Props) =>
   };
 
   const currentWorkspaceButton = (
-    <EuiCollapsibleNavGroup>
-      <EuiFlexGroup>
-        <EuiFlexItem>
-          <EuiIcon type="logoOpenSearch" size="l" />
-        </EuiFlexItem>
-        <EuiFlexItem>
-          <EuiText>
-            <strong> {currentWorkspaceName} </strong>
-          </EuiText>
-        </EuiFlexItem>
-        <EuiFlexItem>
-          <EuiIcon type="arrowDown" onClick={onButtonClick} />
-        </EuiFlexItem>
-      </EuiFlexGroup>
-    </EuiCollapsibleNavGroup>
-  );
-
-  const currentWorkspaceTitle = (
-    <EuiFlexGroup>
-      <EuiFlexItem>
-        <EuiIcon type="logoOpenSearch" size="l" />
-      </EuiFlexItem>
-      <EuiFlexItem>
-        <EuiText>
-          <strong> {currentWorkspaceName} </strong>
-        </EuiText>
-      </EuiFlexItem>
-      <EuiFlexItem>
-        <EuiIcon type="cross" onClick={closePopover} />
-      </EuiFlexItem>
-    </EuiFlexGroup>
+    <EuiCollapsibleNavGroup
+      title={currentWorkspaceName}
+      iconType={currentWorkspace?.icon ?? 'users'}
+      isCollapsible={true}
+      initialIsOpen={false}
+      onClick={onButtonClick}
+      forceState={isPopoverOpen ? 'open' : 'closed'}
+    />
   );
 
   const panels = [
     {
       id: 0,
-      title: currentWorkspaceTitle,
       items: [
         {
           name: (
@@ -212,12 +180,13 @@ export const WorkspaceMenu = ({ basePath, getUrlForApp, workspaces }: Props) =>
 
   return (
     <EuiPopover
-      id="contextMenuExample"
+      id="workspaceContextMenu"
+      display="block"
       button={currentWorkspaceButton}
       isOpen={isPopoverOpen}
       closePopover={closePopover}
       panelPaddingSize="none"
-      anchorPosition="downLeft"
+      anchorPosition="downCenter"
     >
       <EuiContextMenu initialPanelId={0} panels={panels} />
     </EuiPopover>