diff --git a/client/src/locales/en-US.json b/client/src/locales/en-US.json
index ddf4c5f5ab8..aabb0ede85a 100644
--- a/client/src/locales/en-US.json
+++ b/client/src/locales/en-US.json
@@ -365,6 +365,7 @@
         "createWorkspace": "New workspace",
         "itemCount": "No items | 1 item | {count} items",
         "noWorkspaces": "You do not have access to any workspace yet. Workspaces that you create or have been shared with you will be listed here.",
+        "loading": "Loading your workspaces...",
         "noMatchingWorkspaces": "No workspace match this search filter.",
         "listError": "Failed to list the workspaces.",
         "newWorkspaceError": "Failed to create a new workspace.",
@@ -430,6 +431,7 @@
         "itemCount": "No items | 1 item | {count} items",
         "itemSelectedCount": "No selected items | 1 selected item | {count} selected items",
         "emptyFolder": "This folder is empty.",
+        "loading": "Loading the folder...",
         "listDisplayTitles": {
             "name": "Name",
             "updatedBy": "Updated By",
diff --git a/client/src/locales/fr-FR.json b/client/src/locales/fr-FR.json
index 3d82f74853b..80366f900d5 100644
--- a/client/src/locales/fr-FR.json
+++ b/client/src/locales/fr-FR.json
@@ -365,6 +365,7 @@
         "createWorkspace": "Nouvel espace de travail",
         "itemCount": "Aucun élément | 1 élément | {count} éléments",
         "noWorkspaces": "Vous n'avez pas encore accès à un espace de travail. Les espaces de travail que vous créerez ou qui vous seront partagés s'afficheront ici.",
+        "loading": "Chargement de vos espaces de travail...",
         "noMatchingWorkspaces": "Aucun espace de travail ne correspond à cette recherche.",
         "listError": "Impossible de lister les espaces de travail.",
         "newWorkspaceError": "Impossible de créer le nouvel espace de travail.",
@@ -430,6 +431,7 @@
         "itemCount": "Aucun élément | Un élément | {count} éléments",
         "itemSelectedCount": "Aucun élément sélectionné | 1 élément sélectionné | {count} éléments sélectionnés",
         "emptyFolder": "Ce dossier est vide.",
+        "loading": "Chargement du dossier...",
         "listDisplayTitles": {
             "name": "Nom",
             "updatedBy": "Modifié par",
diff --git a/client/src/views/files/FoldersPage.vue b/client/src/views/files/FoldersPage.vue
index 5a2c472a506..4c6f5c93857 100644
--- a/client/src/views/files/FoldersPage.vue
+++ b/client/src/views/files/FoldersPage.vue
@@ -131,7 +131,20 @@
           @files-added="startImportFiles"
         />
         <div
-          v-if="folders.entriesCount() + files.entriesCount() + (fileOperationsCurrentDir ? fileOperationsCurrentDir.length : 0) === 0"
+          v-show="querying"
+          class="no-files-content"
+        >
+          <ms-spinner
+            class="loading-spinner"
+            :title="'FoldersPage.loading'"
+          />
+        </div>
+
+        <div
+          v-if="
+            !querying &&
+            folders.entriesCount() + files.entriesCount() + (fileOperationsCurrentDir ? fileOperationsCurrentDir.length : 0) === 0
+          "
           class="no-files body-lg"
         >
           <file-drop-zone
@@ -149,7 +162,7 @@
             </div>
           </file-drop-zone>
         </div>
-        <div v-else>
+        <div v-else-if="!querying">
           <div v-if="displayView === DisplayState.List">
             <file-list-display
               :files="files"
@@ -200,6 +213,7 @@ import {
   Translatable,
   Clipboard,
   asyncComputed,
+  MsSpinner,
 } from 'megashark-lib';
 import * as parsec from '@/parsec';
 
@@ -311,6 +325,9 @@ const folders = ref(new EntryCollection<FolderModel>());
 const files = ref(new EntryCollection<FileModel>());
 const displayView = ref(DisplayState.List);
 const workspaceInfo: Ref<parsec.StartedWorkspaceInfo | null> = ref(null);
+// Init at true to avoid blinking while we're mounting the component
+// but we're not loading the files yet.
+const querying = ref(true);
 
 const fileInputsRef = ref();
 let eventCbId: string | null = null;
@@ -702,6 +719,7 @@ async function listFolder(): Promise<void> {
   if (!currentRouteIs(Routes.Documents)) {
     return;
   }
+  querying.value = true;
   const result = await parsec.statFolderChildren(workspaceInfo.value.handle, currentPath.value);
   if (result.ok) {
     const newFolders: FolderModel[] = [];
@@ -761,6 +779,7 @@ async function listFolder(): Promise<void> {
       PresentationMode.Toast,
     );
   }
+  querying.value = false;
 }
 
 async function onEntryClick(entry: EntryModel, _event: Event): Promise<void> {
@@ -1199,14 +1218,13 @@ async function openEntryContextMenu(event: Event, entry: EntryModel, onFinished?
 </script>
 
 <style scoped lang="scss">
-.folder-container div:not(.no-files-content) {
+.folder-container {
   height: 100%;
 }
 
 .no-files {
   width: 100%;
   height: 100%;
-  color: var(--parsec-color-light-secondary-grey);
   display: flex;
   margin: auto;
   align-items: center;
@@ -1214,13 +1232,21 @@ async function openEntryContextMenu(event: Event, entry: EntryModel, onFinished?
   &-content {
     border-radius: var(--parsec-radius-8);
     display: flex;
-    height: fit-content;
+    height: 100%;
     width: 100%;
     text-align: center;
     flex-direction: column;
     gap: 1rem;
     align-items: center;
     padding: 2rem 1rem;
+    justify-content: center;
+    color: var(--parsec-color-light-secondary-hard-grey);
+
+    .loading-spinner {
+      display: flex;
+      flex-direction: column-reverse;
+      gap: 1rem;
+    }
   }
 }
 </style>
diff --git a/client/src/views/workspaces/WorkspacesPage.vue b/client/src/views/workspaces/WorkspacesPage.vue
index f2c601b56ba..a81c3af6e71 100644
--- a/client/src/views/workspaces/WorkspacesPage.vue
+++ b/client/src/views/workspaces/WorkspacesPage.vue
@@ -42,7 +42,17 @@
       <!-- workspaces -->
       <div class="workspaces-container scroll">
         <div
-          v-if="filteredWorkspaces.length === 0"
+          v-show="querying"
+          class="no-workspaces-content"
+        >
+          <ms-spinner
+            class="loading-spinner"
+            :title="'WorkspacesPage.loading'"
+          />
+        </div>
+
+        <div
+          v-if="!querying && filteredWorkspaces.length === 0"
           class="no-workspaces body"
         >
           <div class="no-workspaces-content">
@@ -161,6 +171,7 @@ import {
   MsSorter,
   MsSorterChangeEvent,
   MsSearchInput,
+  MsSpinner,
 } from 'megashark-lib';
 import {
   WORKSPACES_PAGE_DATA_KEY,
@@ -223,6 +234,7 @@ const workspaceList: Ref<Array<WorkspaceInfo>> = ref([]);
 const displayView = ref(DisplayState.Grid);
 const favorites: Ref<WorkspaceID[]> = ref([]);
 const filterWorkspaceName = ref('');
+const querying = ref(true);
 
 const informationManager: InformationManager = inject(InformationManagerKey)!;
 const storageManager: StorageManager = inject(StorageManagerKey)!;
@@ -396,6 +408,7 @@ async function refreshWorkspacesList(): Promise<void> {
   if (!currentRouteIs(Routes.Workspaces)) {
     return;
   }
+  querying.value = true;
   const result = await parsecListWorkspaces();
   if (result.ok) {
     for (const wk of result.value) {
@@ -424,6 +437,7 @@ async function refreshWorkspacesList(): Promise<void> {
       PresentationMode.Toast,
     );
   }
+  querying.value = false;
 }
 
 const filteredWorkspaces = computed(() => {
@@ -532,12 +546,19 @@ async function onOpenWorkspaceContextMenu(workspace: WorkspaceInfo, event: Event
   &-content {
     border-radius: var(--parsec-radius-8);
     display: flex;
-    height: fit-content;
+    height: 100%;
     text-align: center;
     flex-direction: column;
     gap: 1rem;
     align-items: center;
     padding: 2rem 1rem;
+    justify-content: center;
+
+    .loading-spinner {
+      display: flex;
+      flex-direction: column-reverse;
+      gap: 1rem;
+    }
 
     #new-workspace {
       display: flex;
diff --git a/newsfragments/8617.misc.rst b/newsfragments/8617.misc.rst
new file mode 100644
index 00000000000..fe606dddf95
--- /dev/null
+++ b/newsfragments/8617.misc.rst
@@ -0,0 +1 @@
+Added spinners when listing workspaces and folders