diff --git a/client/src/views/sidebar-menu/SidebarMenuPage.vue b/client/src/views/sidebar-menu/SidebarMenuPage.vue
index 2dc2d6ab1a5..ba899ad89e2 100644
--- a/client/src/views/sidebar-menu/SidebarMenuPage.vue
+++ b/client/src/views/sidebar-menu/SidebarMenuPage.vue
@@ -16,12 +16,13 @@
         class="sidebar"
       >
         <ion-header class="sidebar-header">
-          <div v-show="!isManagement()">
+          <div>
             <!-- active organization -->
             <ion-card class="organization-card">
               <ion-card-header
                 class="organization-card-header organization-card-header-desktop"
                 @click="openOrganizationChoice($event)"
+                v-show="!isManagement()"
               >
                 <ion-avatar class="organization-avatar body-lg">
                   <span v-if="!isTrialOrg">{{ userInfo ? userInfo.organizationId.substring(0, 2) : '' }}</span>
@@ -42,6 +43,21 @@
                 />
               </ion-card-header>
 
+              <div v-show="isManagement()">
+                <div
+                  class="back-organization"
+                  @click="navigateTo(Routes.Workspaces)"
+                >
+                  <ion-button
+                    fill="clear"
+                    class="back-button"
+                  >
+                    <ion-icon :icon="chevronBack" />
+                    {{ $msTranslate('SideMenu.back') }}
+                  </ion-button>
+                </div>
+              </div>
+
               <div
                 class="organization-card-buttons"
                 v-if="userInfo"
@@ -49,6 +65,7 @@
                 <ion-text
                   @click="navigateTo(Routes.Users)"
                   class="organization-card-buttons__item button-medium"
+                  :class="currentRouteIsOrganizationManagementRoute() ? 'active' : ''"
                   id="manageOrganization"
                   v-show="userInfo.currentProfile != UserProfile.Outsider"
                   button
@@ -85,21 +102,6 @@
             <!-- end of active organization -->
           </div>
 
-          <div v-show="isManagement()">
-            <div
-              class="back-organization"
-              @click="navigateTo(Routes.Workspaces)"
-            >
-              <ion-button
-                fill="clear"
-                class="back-button"
-              >
-                <ion-icon :icon="chevronBack" />
-                {{ $msTranslate('SideMenu.back') }}
-              </ion-button>
-            </div>
-          </div>
-
           <!-- frozen organization -->
           <div
             class="freeze-card"
@@ -702,6 +704,7 @@ async function onRecentFilesMenuVisibilityChanged(visible: boolean): Promise<voi
     --background: transparent;
     position: relative;
     z-index: 12;
+    border-top: 1px solid var(--parsec-color-light-primary-30-opacity15);
   }
 
   .organization-workspaces,
@@ -723,21 +726,22 @@ async function onRecentFilesMenuVisibilityChanged(visible: boolean): Promise<voi
   &-header {
     display: flex;
     flex-direction: row;
-    border-radius: var(--parsec-radius-8);
+    border-radius: var(--parsec-radius-12);
     box-shadow: none;
     align-items: center;
     margin: 0 0.5rem;
-    padding: 0.5rem 1rem;
+    padding: 0.75rem 1rem;
     gap: 0.5em;
     position: relative;
     z-index: 2;
+    border: 1px solid transparent;
 
     &-desktop:hover {
       cursor: pointer;
-      background: var(--parsec-color-light-primary-30-opacity15);
+      border-color: var(--parsec-color-light-primary-30-opacity15);
     }
 
-    .organization-avatar {
+    &-desktop .organization-avatar {
       background-color: var(--parsec-color-light-secondary-premiere);
       color: var(--parsec-color-light-primary-600);
       width: 2rem;
@@ -836,7 +840,8 @@ async function onRecentFilesMenuVisibilityChanged(visible: boolean): Promise<voi
   align-items: center;
   user-select: none;
   align-self: stretch;
-  padding: 1rem;
+  padding: 0.625rem 1rem;
+  border: 1px solid transparent;
   color: var(--parsec-color-light-secondary-inversed-contrast);
   gap: 1rem;
 
@@ -877,7 +882,6 @@ ion-menu {
     align-items: center;
     justify-content: space-between;
     transition: border 0.2s ease-in-out;
-    border-top: 1px solid var(--parsec-color-light-primary-30-opacity15);
     padding: 1.5em 0 1em 0.5rem;
 
     &__title {
@@ -1059,7 +1063,6 @@ ion-menu {
 
   .title-h4 {
     padding: 1.5em 0 1em;
-    border-top: 1px solid var(--parsec-color-light-primary-30-opacity15);
   }
 }
 </style>
diff --git a/client/tests/e2e/specs/sidebar.spec.ts b/client/tests/e2e/specs/sidebar.spec.ts
index 70ca4f73a90..3de124542eb 100644
--- a/client/tests/e2e/specs/sidebar.spec.ts
+++ b/client/tests/e2e/specs/sidebar.spec.ts
@@ -5,6 +5,13 @@ import { expect, msTest } from '@tests/e2e/helpers';
 msTest('Sidebar in organization management', async ({ organizationPage }) => {
   const sidebar = organizationPage.locator('.sidebar');
 
+  await expect(sidebar.locator('.back-button')).toBeVisible();
+
+  const mainButtons = sidebar.locator('.organization-card-buttons').locator('.organization-card-buttons__item');
+  await expect(mainButtons).toHaveText(['Manage my organization', 'My workspaces']);
+  await expect(mainButtons.nth(0)).toHaveTheClass('active');
+  await expect(mainButtons.nth(1)).not.toHaveTheClass('active');
+
   await expect(sidebar.locator('.file-workspaces')).toBeHidden();
   await expect(sidebar.locator('.favorites')).toBeHidden();
   await expect(sidebar.locator('.workspaces')).toBeHidden();
@@ -18,6 +25,13 @@ msTest('Sidebar in organization management', async ({ organizationPage }) => {
 msTest('Sidebar in workspaces page', async ({ connected }) => {
   const sidebar = connected.locator('.sidebar');
 
+  await expect(sidebar.locator('.back-button')).toBeHidden();
+
+  const mainButtons = sidebar.locator('.organization-card-buttons').locator('.organization-card-buttons__item');
+  await expect(mainButtons).toHaveText(['Manage my organization', 'My workspaces']);
+  await expect(mainButtons.nth(0)).not.toHaveTheClass('active');
+  await expect(mainButtons.nth(1)).toHaveTheClass('active');
+
   await expect(sidebar.locator('.file-workspaces')).toBeVisible();
   await expect(sidebar.locator('.favorites')).toBeHidden();
   await expect(sidebar.locator('.workspaces')).toBeVisible();