diff --git a/client/src/components/organizations/OrganizationSwitchPopover.vue b/client/src/components/organizations/OrganizationSwitchPopover.vue
new file mode 100644
index 00000000000..b15ad63b31e
--- /dev/null
+++ b/client/src/components/organizations/OrganizationSwitchPopover.vue
@@ -0,0 +1,220 @@
+<!-- Parsec Cloud (https://parsec.cloud) Copyright (c) BUSL-1.1 2016-present Scille SAS -->
+
+<template>
+  <div class="popover-switch">
+    <ion-title class="popover-switch-title body">{{ $t('OrganizationSwitch.loggedInOrgs') }}</ion-title>
+    <ion-list class="orga-list">
+      <ion-item
+        class="orga-list__item body"
+        button
+        lines="none"
+        v-for="org in connectedOrgs"
+        :key="org.handle"
+        :disabled="org.active"
+        @click="onOrganizationClick(org)"
+      >
+        <div class="orga">
+          <ion-avatar class="orga-avatar">
+            <span>{{ org.id.substring(0, 2) }}</span>
+          </ion-avatar>
+          <div class="orga-text-content">
+            <ion-label class="orga-text-content__name">
+              <span class="body">
+                {{ org.id }}
+              </span>
+            </ion-label>
+            <ion-label class="orga-text-content__email">
+              <span class="body-sm">
+                {{ org.userLabel }}
+              </span>
+            </ion-label>
+          </div>
+
+          <ion-text
+            class="badge caption-caption"
+            v-show="org.active"
+            :outline="true"
+          >
+            {{ $t('OrganizationSwitch.active') }}
+          </ion-text>
+        </div>
+      </ion-item>
+
+      <ion-item
+        class="orga-list__item body"
+        button
+        lines="none"
+        @click="onAllOrganizationClick"
+      >
+        <div class="orga">
+          <ion-avatar class="orga-avatar ellipsis">
+            <ion-icon :icon="ellipsisHorizontal" />
+          </ion-avatar>
+          <div class="orga-text-content">
+            <ion-label class="orga-text-content__name">
+              <span class="body">
+                {{ $t('OrganizationSwitch.myOrgs') }}
+              </span>
+            </ion-label>
+          </div>
+        </div>
+      </ion-item>
+    </ion-list>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ConnectionHandle, OrganizationID, getLoggedInDevices } from '@/parsec';
+import { getConnectionHandle } from '@/router';
+import { IonAvatar, IonIcon, IonItem, IonLabel, IonList, IonText, IonTitle, popoverController } from '@ionic/vue';
+import { ellipsisHorizontal } from 'ionicons/icons';
+import { Ref, onMounted, ref } from 'vue';
+
+interface ConnectedOrganization {
+  id: OrganizationID;
+  userLabel: string;
+  active: boolean;
+  handle: ConnectionHandle;
+}
+
+const connectedOrgs: Ref<Array<ConnectedOrganization>> = ref([]);
+
+onMounted(async () => {
+  const result = await getLoggedInDevices();
+  connectedOrgs.value = result.map((info) => {
+    return {
+      id: info.device.organizationId,
+      active: getConnectionHandle() === info.handle,
+      handle: info.handle,
+      userLabel: info.device.humanHandle.label,
+    };
+  });
+});
+
+async function onOrganizationClick(org: ConnectedOrganization): Promise<void> {
+  if (org.handle !== getConnectionHandle()) {
+    await popoverController.dismiss({
+      handle: org.handle,
+    });
+  }
+}
+
+async function onAllOrganizationClick(): Promise<void> {
+  await popoverController.dismiss({ handle: null });
+}
+</script>
+
+<style lang="scss" scoped>
+.popover-switch {
+  padding: 1rem;
+  display: flex;
+  flex-direction: column;
+  gap: 0.75rem;
+
+  &-title {
+    color: var(--parsec-color-light-secondary-grey);
+    padding: 0;
+  }
+}
+
+.orga-list {
+  display: flex;
+  flex-direction: column;
+  gap: 0.25rem;
+  padding: 0;
+
+  &__item {
+    --background: none;
+    --background-hover: var(--parsec-color-light-primary-50);
+    --background-hover-opacity: 1;
+    border-radius: var(--parsec-radius-6);
+    --inner-padding-end: 0;
+    --padding-start: 0;
+    position: relative;
+    z-index: 2;
+    pointer-events: auto;
+
+    &::part(native) {
+      padding: 0;
+    }
+
+    &:hover {
+      .orga-avatar {
+        background-color: var(--parsec-color-light-secondary-white);
+      }
+    }
+  }
+}
+
+.orga {
+  padding: 0.5rem;
+  display: flex;
+  align-items: center;
+  gap: 0.75rem;
+  width: 100%;
+
+  &-avatar {
+    background-color: var(--parsec-color-light-secondary-premiere);
+    color: var(--parsec-color-light-primary-600);
+    width: 2.5rem;
+    height: 2.5rem;
+    margin: 0;
+    border-radius: var(--parsec-radius-circle);
+    text-align: center;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex-shrink: 0;
+    position: relative;
+    z-index: 1;
+
+    &:not(.ellipsis)::after {
+      content: '';
+      position: absolute;
+      bottom: 0;
+      right: -4px;
+      height: 0.625rem;
+      width: 0.625rem;
+      border-radius: 50%;
+      border: var(--parsec-color-light-secondary-white) solid 0.25rem;
+      background-color: var(--parsec-color-light-success-500);
+    }
+  }
+
+  &-text-content {
+    margin: 0;
+    display: flex;
+    flex-direction: column;
+
+    &::part(native) {
+      padding: 0;
+    }
+
+    &__name {
+      color: var(--parsec-color-light-secondary-text);
+
+      .body {
+        font-size: 0.875rem;
+      }
+    }
+
+    &__email {
+      color: var(--parsec-color-light-secondary-grey);
+    }
+  }
+}
+
+// eslint-disable-next-line vue-scoped-css/no-unused-selector
+.item-disabled {
+  opacity: 1;
+  pointer-events: none;
+
+  .badge {
+    color: var(--parsec-color-light-success-500);
+    background: var(--parsec-color-light-success-100);
+    margin-left: auto;
+    border-radius: var(--parsec-radius-12);
+    padding: 0.25rem 0.5rem;
+  }
+}
+</style>
diff --git a/client/src/locales/en-US.json b/client/src/locales/en-US.json
index c491e2ac167..db0f5403424 100644
--- a/client/src/locales/en-US.json
+++ b/client/src/locales/en-US.json
@@ -85,7 +85,8 @@
             "sortByUserName": "User Name",
             "sortByLastLogin": "Last login",
             "labelSortBy": "Sort by",
-            "search": "Search"
+            "search": "Search",
+            "loggedIn": "Logged in"
         },
         "noExistingOrganization": {
             "title": "Need to create or join an organization?",
@@ -1187,5 +1188,10 @@
             "missingToken": "Link doesn't include a token.",
             "invalidToken": "Link contains an invalid token."
         }
+    },
+    "OrganizationSwitch": {
+        "loggedInOrgs": "Connected organizations",
+        "myOrgs": "My organizations",
+        "active": "Active"
     }
 }
diff --git a/client/src/locales/fr-FR.json b/client/src/locales/fr-FR.json
index 6e7fc29f3d5..318eb53c780 100644
--- a/client/src/locales/fr-FR.json
+++ b/client/src/locales/fr-FR.json
@@ -85,7 +85,8 @@
             "sortByUserName": "Nom d'utilisateur",
             "sortByLastLogin": "Dernière connexion",
             "labelSortBy": "Trier par",
-            "search": "Rechercher"
+            "search": "Rechercher",
+            "loggedIn": "Connecté"
         },
         "noExistingOrganization": {
             "title": "Besoin de créer ou rejoindre une organisation ?",
@@ -1187,5 +1188,10 @@
             "missingToken": "Le lien n'inclut pas de jeton.",
             "invalidToken": "Le lien contient un jeton invalide."
         }
+    },
+    "OrganizationSwitch": {
+        "loggedInOrgs": "Organisations connectées",
+        "myOrgs": "Mes organisations",
+        "active": "Active"
     }
 }
diff --git a/client/src/parsec/invitation.ts b/client/src/parsec/invitation.ts
index 68cfc41cdb0..e9fad1e6f03 100644
--- a/client/src/parsec/invitation.ts
+++ b/client/src/parsec/invitation.ts
@@ -68,8 +68,9 @@ export async function listUserInvitations(): Promise<Result<Array<UserInvitation
     });
     return result as any;
   } else {
-    return new Promise<Result<Array<UserInvitation>, ListInvitationsError>>((resolve, _reject) => {
-      const ret: Array<UserInvitation> = [
+    return {
+      ok: true,
+      value: [
         {
           tag: InviteListItemTag.User,
           addr: 'parsec://parsec.example.com/MyOrg?action=claim_device&token=12346565645645654645645645645645',
@@ -86,9 +87,8 @@ export async function listUserInvitations(): Promise<Result<Array<UserInvitation
           claimerEmail: 'gale@waterdeep.faerun',
           status: InvitationStatus.Ready,
         },
-      ];
-      resolve({ ok: true, value: ret });
-    });
+      ],
+    };
   }
 }
 
diff --git a/client/src/parsec/login.ts b/client/src/parsec/login.ts
index ffcdf184d5f..c0af8f2f2b3 100644
--- a/client/src/parsec/login.ts
+++ b/client/src/parsec/login.ts
@@ -25,6 +25,29 @@ import {
   UserProfile,
 } from '@/parsec/types';
 
+export interface LoggedInDeviceInfo {
+  handle: ConnectionHandle;
+  device: AvailableDevice;
+}
+
+const loggedInDevices: Array<LoggedInDeviceInfo> = [];
+
+export async function getLoggedInDevices(): Promise<Array<LoggedInDeviceInfo>> {
+  return loggedInDevices;
+}
+
+export function isDeviceLoggedIn(device: AvailableDevice): boolean {
+  return loggedInDevices.find((info) => info.device.slug === device.slug) !== undefined;
+}
+
+export function getDeviceHandle(device: AvailableDevice): ConnectionHandle | null {
+  const info = loggedInDevices.find((info) => info.device.slug === device.slug);
+  if (info) {
+    return info.handle;
+  }
+  return null;
+}
+
 export async function listAvailableDevices(): Promise<Array<AvailableDevice>> {
   return await libparsec.listAvailableDevices(window.getConfigDir());
 }
@@ -34,6 +57,11 @@ export async function login(device: AvailableDevice, password: string): Promise<
     console.log('Event received', event);
   }
 
+  const info = loggedInDevices.find((info) => info.device.slug === device.slug);
+  if (info !== undefined) {
+    return { ok: true, value: info.handle };
+  }
+
   if (!needsMocks()) {
     const clientConfig = getClientConfig();
     const strategy: DeviceAccessStrategyPassword = {
@@ -41,9 +69,14 @@ export async function login(device: AvailableDevice, password: string): Promise<
       password: password,
       keyFile: device.keyFilePath,
     };
-    return await libparsec.clientStart(clientConfig, parsecEventCallback, strategy);
+    const result = await libparsec.clientStart(clientConfig, parsecEventCallback, strategy);
+    if (result.ok) {
+      loggedInDevices.push({ handle: result.value, device: device });
+    }
+    return result;
   } else {
     if (password === 'P@ssw0rd.' || password === 'AVeryL0ngP@ssw0rd') {
+      loggedInDevices.push({ handle: DEFAULT_HANDLE, device: device });
       return { ok: true, value: DEFAULT_HANDLE };
     }
     return {
@@ -60,8 +93,19 @@ export async function logout(): Promise<Result<null, ClientStopError>> {
   const handle = getParsecHandle();
 
   if (handle !== null && !needsMocks()) {
-    return await libparsec.clientStop(handle);
+    const result = await libparsec.clientStop(handle);
+    if (result.ok) {
+      const index = loggedInDevices.findIndex((info) => info.handle === handle);
+      if (index !== -1) {
+        loggedInDevices.splice(index, 1);
+      }
+    }
+    return result;
   } else {
+    const index = loggedInDevices.findIndex((info) => info.handle === handle);
+    if (index !== -1) {
+      loggedInDevices.splice(index, 1);
+    }
     return { ok: true, value: null };
   }
 }
diff --git a/client/src/router/index.ts b/client/src/router/index.ts
index a1f42f9ea04..be69e4b6d3e 100644
--- a/client/src/router/index.ts
+++ b/client/src/router/index.ts
@@ -3,6 +3,7 @@
 export * from '@/router/checks';
 export * from '@/router/navigation';
 export {
+  getConnectionHandle,
   getCurrentRouteName,
   getCurrentRouteParams,
   getCurrentRouteQuery,
@@ -12,3 +13,4 @@ export {
   getWorkspaceId,
 } from '@/router/params';
 export * from '@/router/types';
+export { watchOrganizationSwitch, watchRoute } from '@/router/watchers';
diff --git a/client/src/router/navigation.ts b/client/src/router/navigation.ts
index 507d358d5e3..cece3099737 100644
--- a/client/src/router/navigation.ts
+++ b/client/src/router/navigation.ts
@@ -1,8 +1,9 @@
 // Parsec Cloud (https://parsec.cloud) Copyright (c) BUSL-1.1 2016-present Scille SAS
 
-import { startWorkspace, WorkspaceID } from '@/parsec';
+import { ConnectionHandle, startWorkspace, WorkspaceID } from '@/parsec';
 import { getConnectionHandle } from '@/router/params';
-import { getRouter, Routes } from '@/router/types';
+import { getCurrentRoute, getRouter, Routes } from '@/router/types';
+import { organizationKey } from '@/router/watchers';
 import { LocationQueryRaw, RouteParamsRaw } from 'vue-router';
 
 export interface NavigationOptions {
@@ -51,3 +52,59 @@ export async function routerGoBack(): Promise<void> {
   const router = getRouter();
   router.go(-1);
 }
+
+interface RouteBackup {
+  handle: ConnectionHandle;
+  data: {
+    route: Routes;
+    params: object;
+    query: object;
+  };
+}
+
+const routesBackup: Array<RouteBackup> = [];
+
+export async function switchOrganization(handle: ConnectionHandle | null, backup = true): Promise<void> {
+  if (backup) {
+    const currentHandle = getConnectionHandle();
+
+    if (currentHandle === null) {
+      console.error('No current handle');
+      return;
+    }
+    if (handle === currentHandle) {
+      console.error('Cannot switch to same organization');
+      return;
+    }
+    // Backup the current route
+    const currentRoute = getCurrentRoute();
+    const index = routesBackup.findIndex((bk) => bk.handle === currentHandle);
+    if (index !== -1) {
+      routesBackup.splice(index, 1);
+    }
+    console.log('Saving', currentRoute.value.name, currentRoute.value.params, currentRoute.value.query);
+    routesBackup.push({
+      handle: currentHandle,
+      data: {
+        route: currentRoute.value.name as Routes,
+        params: currentRoute.value.params,
+        query: currentRoute.value.query,
+      },
+    });
+  }
+
+  // No handle, navigate to organization list
+  if (!handle) {
+    await navigateTo(Routes.Home, { skipHandle: true, replace: true });
+    organizationKey.value += 1;
+  } else {
+    const backup = routesBackup.find((bk) => bk.handle === handle);
+    if (!backup) {
+      console.error('No backup, organization was not connected');
+      return;
+    }
+    console.log('Restoring', backup.data.route, backup.data.params, backup.data.query);
+    await navigateTo(backup.data.route, { params: backup.data.params, query: backup.data.query, skipHandle: true, replace: true });
+    organizationKey.value += 1;
+  }
+}
diff --git a/client/src/router/types.ts b/client/src/router/types.ts
index 5edb33196d1..42487c4235b 100644
--- a/client/src/router/types.ts
+++ b/client/src/router/types.ts
@@ -1,7 +1,7 @@
 // Parsec Cloud (https://parsec.cloud) Copyright (c) BUSL-1.1 2016-present Scille SAS
 
 import { createRouter, createWebHistory } from '@ionic/vue-router';
-import { Ref, WatchStopHandle, watch } from 'vue';
+import { Ref } from 'vue';
 import { RouteLocationNormalizedLoaded, RouteRecordRaw, Router } from 'vue-router';
 
 export enum Routes {
@@ -134,8 +134,3 @@ export function getRouter(): Router {
 export function getCurrentRoute(): Ref<RouteLocationNormalizedLoaded> {
   return (router as Router).currentRoute;
 }
-
-export function watchRoute(callback: () => Promise<void>): WatchStopHandle {
-  const currentRoute = getCurrentRoute();
-  return watch(currentRoute, callback);
-}
diff --git a/client/src/router/watchers.ts b/client/src/router/watchers.ts
new file mode 100644
index 00000000000..3af0a60e283
--- /dev/null
+++ b/client/src/router/watchers.ts
@@ -0,0 +1,15 @@
+// Parsec Cloud (https://parsec.cloud) Copyright (c) BUSL-1.1 2016-present Scille SAS
+
+import { getCurrentRoute } from '@/router/types';
+import { Ref, WatchStopHandle, ref, watch } from 'vue';
+
+export const organizationKey: Ref<number> = ref(0);
+
+export function watchRoute(callback: () => Promise<void>): WatchStopHandle {
+  const currentRoute = getCurrentRoute();
+  return watch(currentRoute, callback);
+}
+
+export function watchOrganizationSwitch(callback: () => Promise<void>): WatchStopHandle {
+  return watch(organizationKey, callback);
+}
diff --git a/client/src/views/files/FoldersPage.vue b/client/src/views/files/FoldersPage.vue
index c12113796c5..0a5f613ff0a 100644
--- a/client/src/views/files/FoldersPage.vue
+++ b/client/src/views/files/FoldersPage.vue
@@ -237,6 +237,9 @@ const fileImports: Ref<Array<FileImport>> = ref([]);
 
 const routeWatchCancel = watchRoute(async () => {
   const newPath = getDocumentPath();
+  if (newPath === '') {
+    return;
+  }
   if (newPath !== currentPath.value) {
     currentPath.value = newPath;
   }
@@ -260,6 +263,10 @@ const ownRole: Ref<parsec.WorkspaceRole> = ref(parsec.WorkspaceRole.Reader);
 onMounted(async () => {
   ownRole.value = await parsec.getWorkspaceRole(getWorkspaceId());
   callbackId = await importManager.registerCallback(onFileImportState);
+  const path = getDocumentPath();
+  if (path !== '') {
+    currentPath.value = path;
+  }
   await listFolder();
 });
 
diff --git a/client/src/views/header/HeaderPage.vue b/client/src/views/header/HeaderPage.vue
index d93231c434f..4a8c2f0b21d 100644
--- a/client/src/views/header/HeaderPage.vue
+++ b/client/src/views/header/HeaderPage.vue
@@ -7,7 +7,7 @@
         <!-- icon visible when menu is hidden -->
         <ion-buttons slot="start">
           <ion-button
-            v-if="!isPlatform('mobile') && !isSidebarMenuVisible()"
+            v-if="!isMobile() && !isSidebarMenuVisible()"
             slot="icon-only"
             id="trigger-toggle-menu-button"
             class="ion-hide-lg-down topbar-button__item"
@@ -62,7 +62,7 @@
           <div class="topbar-button__list">
             <ion-button
               v-show="false"
-              v-if="!isPlatform('mobile')"
+              v-if="!isMobile()"
               slot="icon-only"
               id="trigger-search-button"
               class="topbar-button__item"
@@ -73,7 +73,7 @@
               />
             </ion-button>
             <ion-button
-              v-if="!isPlatform('mobile')"
+              v-if="!isMobile()"
               slot="icon-only"
               id="trigger-notifications-button"
               class="topbar-button__item"
@@ -105,7 +105,7 @@
 <script setup lang="ts">
 import HeaderBackButton from '@/components/header/HeaderBackButton.vue';
 import HeaderBreadcrumbs, { RouterPathNode } from '@/components/header/HeaderBreadcrumbs.vue';
-import { ClientInfo, Path, WorkspaceName, getClientInfo, getWorkspaceName } from '@/parsec';
+import { ClientInfo, Path, WorkspaceName, getClientInfo, getWorkspaceName, isMobile } from '@/parsec';
 import {
   Routes,
   currentRouteIs,
@@ -133,7 +133,6 @@ import {
   IonPage,
   IonRouterOutlet,
   IonToolbar,
-  isPlatform,
   popoverController,
 } from '@ionic/vue';
 import { home, menu, notifications, search } from 'ionicons/icons';
@@ -145,6 +144,12 @@ const userInfo: Ref<ClientInfo | null> = ref(null);
 const fullPath: Ref<RouterPathNode[]> = ref([]);
 
 const routeWatchCancel = watchRoute(async () => {
+  const result = await getClientInfo();
+  if (result.ok) {
+    userInfo.value = result.value;
+  } else {
+    console.log('Could not get user info', result.error);
+  }
   await updateRoute();
 });
 
diff --git a/client/src/views/home/HomePage.vue b/client/src/views/home/HomePage.vue
index c0c95af0150..d1eab238542 100644
--- a/client/src/views/home/HomePage.vue
+++ b/client/src/views/home/HomePage.vue
@@ -57,8 +57,8 @@
 <script setup lang="ts">
 import { Validity, claimDeviceLinkValidator, claimLinkValidator, claimUserLinkValidator } from '@/common/validators';
 import { MsModalResult, getTextInputFromUser } from '@/components/core';
-import { AvailableDevice, login as parsecLogin } from '@/parsec';
-import { NavigationOptions, Routes, getCurrentRouteQuery, navigateTo, watchRoute } from '@/router';
+import { AvailableDevice, getDeviceHandle, isDeviceLoggedIn, login as parsecLogin } from '@/parsec';
+import { NavigationOptions, Routes, getCurrentRouteQuery, navigateTo, switchOrganization, watchRoute } from '@/router';
 import { Notification, NotificationKey, NotificationLevel, NotificationManager } from '@/services/notificationManager';
 import { StorageManager, StorageManagerKey, StoredDeviceData } from '@/services/storageManager';
 import { translate } from '@/services/translation';
@@ -155,8 +155,13 @@ async function backToOrganizations(): Promise<void> {
 }
 
 function onOrganizationSelected(device: AvailableDevice): void {
-  selectedDevice.value = device;
-  state.value = HomePageState.Login;
+  if (isDeviceLoggedIn(device)) {
+    const handle = getDeviceHandle(device);
+    switchOrganization(handle, false);
+  } else {
+    selectedDevice.value = device;
+    state.value = HomePageState.Login;
+  }
 }
 
 async function login(device: AvailableDevice, password: string): Promise<void> {
diff --git a/client/src/views/home/OrganizationListPage.vue b/client/src/views/home/OrganizationListPage.vue
index 9d79e6e2f93..03a64adb466 100644
--- a/client/src/views/home/OrganizationListPage.vue
+++ b/client/src/views/home/OrganizationListPage.vue
@@ -61,8 +61,11 @@
                       class="card-content__body"
                     />
                     <ion-row class="card-content__footer">
-                      <ion-col size="auto">
-                        <p>
+                      <ion-col
+                        size="auto"
+                        v-show="!isDeviceLoggedIn(device)"
+                      >
+                        <p class="body-sm">
                           {{ $t('HomePage.organizationList.lastLogin') }}
                         </p>
                         <p>
@@ -71,6 +74,16 @@
                           }}
                         </p>
                       </ion-col>
+                      <ion-col
+                        v-show="isDeviceLoggedIn(device)"
+                        class="body connected"
+                      >
+                        <ion-icon
+                          :icon="ellipse"
+                          class="success"
+                        />
+                        {{ $t('HomePage.organizationList.loggedIn') }}
+                      </ion-col>
                     </ion-row>
                   </ion-grid>
                 </ion-card-content>
@@ -87,11 +100,12 @@
 import { formatTimeSince } from '@/common/date';
 import { MsModalResult, MsOptions, MsSearchInput, MsSorter, MsSorterChangeEvent } from '@/components/core';
 import OrganizationCard from '@/components/organizations/OrganizationCard.vue';
-import { AvailableDevice, listAvailableDevices } from '@/parsec';
+import { AvailableDevice, isDeviceLoggedIn, listAvailableDevices } from '@/parsec';
 import { StorageManager, StorageManagerKey, StoredDeviceData } from '@/services/storageManager';
 import { translate } from '@/services/translation';
 import HomePageButtons, { HomePageAction } from '@/views/home/HomePageButtons.vue';
-import { IonButton, IonCard, IonCardContent, IonCardTitle, IonCol, IonGrid, IonRow, IonText, popoverController } from '@ionic/vue';
+import { IonButton, IonCard, IonCardContent, IonCardTitle, IonCol, IonGrid, IonIcon, IonRow, IonText, popoverController } from '@ionic/vue';
+import { ellipse } from 'ionicons/icons';
 import { DateTime } from 'luxon';
 import { Ref, computed, inject, onMounted, ref } from 'vue';
 
@@ -325,6 +339,17 @@ const filteredDevices = computed(() => {
         border-top: 1px solid var(--parsec-color-light-secondary-disabled);
         color: var(--parsec-color-light-secondary-grey);
         height: 4.6em;
+
+        .connected {
+          display: flex;
+          align-items: center;
+          gap: 0.5rem;
+
+          .success {
+            color: var(--parsec-color-light-success-700);
+            font-size: 0.675rem;
+          }
+        }
       }
 
       &:hover {
diff --git a/client/src/views/sidebar-menu/SidebarMenuPage.vue b/client/src/views/sidebar-menu/SidebarMenuPage.vue
index 87737bb7289..4df15dddb6c 100644
--- a/client/src/views/sidebar-menu/SidebarMenuPage.vue
+++ b/client/src/views/sidebar-menu/SidebarMenuPage.vue
@@ -15,8 +15,12 @@
           <div v-show="!currentRouteIsOrganizationManagementRoute()">
             <!-- active organization -->
             <ion-card class="organization-card">
-              <ion-card-header class="organization-card__header">
-                <div class="organization-card__container">
+              <ion-card-header
+                class="organization-card-header"
+                :class="{ 'organization-card-header-hover': isDesktop() }"
+                @click="openOrganizationChoice($event)"
+              >
+                <div class="header-container">
                   <ion-avatar class="orga-avatar">
                     <span>{{ userInfo ? userInfo.organizationId.substring(0, 2) : '' }}</span>
                   </ion-avatar>
@@ -29,17 +33,16 @@
                     </ion-card-title>
                   </div>
                 </div>
-                <!-- Keep it hidden for now since we have no way of switching org -->
                 <div
-                  class="organization-card__icon"
-                  v-show="false"
+                  class="header-icon"
+                  v-show="isDesktop()"
                 >
                   <ms-image :image="CaretExpand" />
                 </div>
               </ion-card-header>
 
               <div
-                class="organization-card__manageBtn"
+                class="organization-card-manageBtn"
                 v-show="userInfo && userInfo.currentProfile != UserProfile.Outsider"
                 @click="navigateTo(Routes.ActiveUsers)"
               >
@@ -210,10 +213,12 @@
 
 <script setup lang="ts">
 import { CaretExpand, MsImage } from '@/components/core';
+import OrganizationSwitchPopover from '@/components/organizations/OrganizationSwitchPopover.vue';
 import {
   ClientInfo,
   UserProfile,
   WorkspaceInfo,
+  isDesktop,
   getClientInfo as parsecGetClientInfo,
   listWorkspaces as parsecListWorkspaces,
 } from '@/parsec';
@@ -225,6 +230,8 @@ import {
   currentRouteIsWorkspaceRoute,
   navigateTo,
   navigateToWorkspace,
+  switchOrganization,
+  watchOrganizationSwitch,
 } from '@/router';
 import useSidebarMenu from '@/services/sidebarMenu';
 import {
@@ -248,6 +255,7 @@ import {
   IonText,
   createGesture,
   menuController,
+  popoverController,
 } from '@ionic/vue';
 import { business, chevronBack, informationCircle, people, pieChart } from 'ionicons/icons';
 import { Ref, WatchStopHandle, onMounted, onUnmounted, ref, watch } from 'vue';
@@ -259,7 +267,7 @@ const { defaultWidth, initialWidth, computedWidth, wasReset } = useSidebarMenu()
 const userInfo: Ref<ClientInfo | null> = ref(null);
 
 // watching wasReset value
-const unwatch: WatchStopHandle = watch(wasReset, (value) => {
+const resetWatchCancel: WatchStopHandle = watch(wasReset, (value) => {
   if (value) {
     resizeMenu(defaultWidth);
     wasReset.value = false;
@@ -276,7 +284,9 @@ async function goToWorkspaceList(): Promise<void> {
   await menuController.close();
 }
 
-onMounted(async () => {
+const organizationWatchCancel = watchOrganizationSwitch(loadAll);
+
+async function loadAll(): Promise<void> {
   const infoResult = await parsecGetClientInfo();
 
   if (infoResult.ok) {
@@ -285,6 +295,16 @@ onMounted(async () => {
     console.log('Failed to get user info', infoResult.error);
   }
 
+  const result = await parsecListWorkspaces();
+  if (result.ok) {
+    workspaces.value = result.value;
+  } else {
+    console.log('Failed to list workspaces', result.error);
+  }
+}
+
+onMounted(async () => {
+  await loadAll();
   if (divider.value) {
     const gesture = createGesture({
       gestureName: 'resize-menu',
@@ -294,16 +314,11 @@ onMounted(async () => {
     });
     gesture.enable();
   }
-  const result = await parsecListWorkspaces();
-  if (result.ok) {
-    workspaces.value = result.value;
-  } else {
-    console.log('Failed to list workspaces', result.error);
-  }
 });
 
 onUnmounted(() => {
-  unwatch();
+  resetWatchCancel();
+  organizationWatchCancel();
 });
 
 function onMove(detail: GestureDetail): void {
@@ -326,6 +341,25 @@ function onEnd(): void {
 function resizeMenu(newWidth: number): void {
   document.documentElement.style.setProperty('--parsec-sidebar-menu-width', `${newWidth}px`);
 }
+
+async function openOrganizationChoice(event: Event): Promise<void> {
+  if (!isDesktop()) {
+    return;
+  }
+  const popover = await popoverController.create({
+    component: OrganizationSwitchPopover,
+    cssClass: 'dropdown-popover',
+    event: event,
+    alignment: 'end',
+    showBackdrop: false,
+  });
+  await popover.present();
+  const { data } = await popover.onDidDismiss();
+  await popover.dismiss();
+  if (data) {
+    switchOrganization(data.handle);
+  }
+}
 </script>
 
 <style lang="scss" scoped>
@@ -381,18 +415,23 @@ function resizeMenu(newWidth: number): void {
   }
 }
 
+.organization-card-header-hover:hover {
+  cursor: pointer;
+  background: var(--parsec-color-light-primary-30-opacity15);
+}
+
 .organization-card {
   --background: var(--parsec-color-light-primary-30-opacity15);
   box-shadow: none;
   margin: 0;
 
-  &__header {
+  &-header {
     display: flex;
     justify-content: space-between;
     flex-direction: row;
   }
 
-  &__container {
+  .header-container {
     box-shadow: none;
     display: flex;
     align-items: center;
@@ -440,25 +479,14 @@ function resizeMenu(newWidth: number): void {
     }
   }
 
-  &__icon {
+  .header-icon {
     white-space: nowrap;
     display: flex;
     align-items: center;
-    background-color: var(--parsec-color-light-primary-800);
-    position: relative;
-    z-index: 2;
-
-    &::before {
-      content: '';
-      height: 100%;
-      width: 100%;
-      position: absolute;
-      z-index: -1;
-      background-color: var(--parsec-color-light-primary-30-opacity15);
-    }
+    background-color: transparent;
   }
 
-  &__manageBtn {
+  &-manageBtn {
     padding: 0.625em 1em;
     cursor: pointer;
     align-items: center;
diff --git a/client/src/views/workspaces/WorkspacesPage.vue b/client/src/views/workspaces/WorkspacesPage.vue
index 6e8ff1e1c92..37359e74b02 100644
--- a/client/src/views/workspaces/WorkspacesPage.vue
+++ b/client/src/views/workspaces/WorkspacesPage.vue
@@ -260,6 +260,7 @@ async function onWorkspaceShareClick(_: Event, workspace: WorkspaceInfo): Promis
   });
   await modal.present();
   await modal.onWillDismiss();
+  await refreshWorkspacesList();
 }
 
 async function openWorkspaceContextMenu(event: Event, workspace: WorkspaceInfo): Promise<void> {
diff --git a/client/tests/e2e/specs/test_active_users_page.ts b/client/tests/e2e/specs/test_active_users_page.ts
index d1abcef5b8a..0b3cad8142a 100644
--- a/client/tests/e2e/specs/test_active_users_page.ts
+++ b/client/tests/e2e/specs/test_active_users_page.ts
@@ -4,7 +4,7 @@ describe('Check active users page', () => {
   beforeEach(() => {
     cy.visitApp();
     cy.login('Boby', 'P@ssw0rd.');
-    cy.get('.organization-card__manageBtn').click();
+    cy.get('.organization-card-manageBtn').click();
   });
 
   afterEach(() => {
diff --git a/client/tests/e2e/specs/test_greet_user_modal.ts b/client/tests/e2e/specs/test_greet_user_modal.ts
index 3116adcb13b..bbce939e6ad 100644
--- a/client/tests/e2e/specs/test_greet_user_modal.ts
+++ b/client/tests/e2e/specs/test_greet_user_modal.ts
@@ -6,7 +6,7 @@ describe('Greet user into an organization', () => {
   beforeEach(() => {
     cy.visitApp();
     cy.login('Boby', 'P@ssw0rd.');
-    cy.get('.organization-card__manageBtn').click();
+    cy.get('.organization-card-manageBtn').click();
     cy.get('.user-menu__item').eq(2).click();
   });
 
diff --git a/client/tests/e2e/specs/test_invitations_page.ts b/client/tests/e2e/specs/test_invitations_page.ts
index 3cce5769d57..138542587c2 100644
--- a/client/tests/e2e/specs/test_invitations_page.ts
+++ b/client/tests/e2e/specs/test_invitations_page.ts
@@ -4,7 +4,7 @@ describe('Check invitations page', () => {
   beforeEach(() => {
     cy.visitApp();
     cy.login('Boby', 'P@ssw0rd.');
-    cy.get('.organization-card__manageBtn').click();
+    cy.get('.organization-card-manageBtn').click();
     cy.get('.user-menu__item').eq(2).click();
   });
 
diff --git a/client/tests/e2e/specs/test_manage_organization.ts b/client/tests/e2e/specs/test_manage_organization.ts
index 2821b26fccf..08e537243bc 100644
--- a/client/tests/e2e/specs/test_manage_organization.ts
+++ b/client/tests/e2e/specs/test_manage_organization.ts
@@ -4,7 +4,7 @@ describe('Check manage org page', () => {
   beforeEach(() => {
     cy.visitApp();
     cy.login('Boby', 'P@ssw0rd.');
-    cy.get('.organization-card__manageBtn').click();
+    cy.get('.organization-card-manageBtn').click();
   });
 
   afterEach(() => {
@@ -13,8 +13,8 @@ describe('Check manage org page', () => {
 
   it('Checks initial status', () => {
     cy.get('.back-organization').find('ion-label').contains('Manage my organization');
-    cy.get('.organization-card__header').should('not.be.visible');
-    cy.get('.organization-card__manageBtn').should('not.be.visible');
+    cy.get('.organization-card-header').should('not.be.visible');
+    cy.get('.organization-card-manageBtn').should('not.be.visible');
     cy.get('.sidebar').find('.list-workspaces').should('not.be.visible');
     cy.get('.sidebar').find('.users').find('ion-item').first().contains('Users');
     cy.get('.sidebar').find('.users').find('ion-item').first().should('have.class', 'item-selected');
diff --git a/client/tests/e2e/specs/test_user_details_modal.ts b/client/tests/e2e/specs/test_user_details_modal.ts
index 038f4d421f8..64d1fccfd6b 100644
--- a/client/tests/e2e/specs/test_user_details_modal.ts
+++ b/client/tests/e2e/specs/test_user_details_modal.ts
@@ -4,7 +4,7 @@ describe('Check user details modal', () => {
   beforeEach(() => {
     cy.visitApp();
     cy.login('Boby', 'P@ssw0rd.');
-    cy.get('.organization-card__manageBtn').click();
+    cy.get('.organization-card-manageBtn').click();
   });
 
   afterEach(() => {