diff --git a/src/app/components/MenuSpacesItem.svelte b/src/app/components/MenuSpacesItem.svelte
index 81ee75c9..059d57e5 100644
--- a/src/app/components/MenuSpacesItem.svelte
+++ b/src/app/components/MenuSpacesItem.svelte
@@ -13,7 +13,7 @@
 </script>
 
 <Link replaceState href={path}>
-  <CardButton class="btn-neutral">
+  <CardButton class="btn-neutral shadow-md">
     {#snippet icon()}
       <div><SpaceAvatar {url} /></div>
     {/snippet}
diff --git a/src/routes/spaces/+page.svelte b/src/routes/spaces/+page.svelte
index 6f23a7cd..a6bed2a4 100644
--- a/src/routes/spaces/+page.svelte
+++ b/src/routes/spaces/+page.svelte
@@ -8,7 +8,7 @@
   import PageContent from "@lib/components/PageContent.svelte"
   import MenuSpacesItem from "@app/components/MenuSpacesItem.svelte"
   import SpaceAdd from "@app/components/SpaceAdd.svelte"
-  import {userSpaceUrls, PLATFORM_RELAYS} from "@app/core/state"
+  import {userSpaceUrls, loadUserGroupSelections, PLATFORM_RELAYS} from "@app/core/state"
   import {pushModal} from "@app/util/modal"
 
   const addSpace = () => pushModal(SpaceAdd)
@@ -37,17 +37,24 @@
     {#each PLATFORM_RELAYS as url (url)}
       <MenuSpacesItem {url} />
     {:else}
-      {#each $userSpaceUrls as url (url)}
-        <MenuSpacesItem {url} />
-      {:else}
-        <div class="flex flex-col gap-8 items-center py-20">
-          <p>You haven't added any spaces yet!</p>
-          <Button class="btn btn-primary" onclick={addSpace}>
-            <Icon icon={AddCircle} />
-            Add a Space
-          </Button>
+      {#await loadUserGroupSelections()}
+        <div class="flex justify-center items-center py-20">
+          <span class="loading loading-spinner mr-3"></span>
+          Loading your spaces...
         </div>
-      {/each}
+      {:then}
+        {#each $userSpaceUrls as url (url)}
+          <MenuSpacesItem {url} />
+        {:else}
+          <div class="flex flex-col gap-8 items-center py-20">
+            <p>You haven't added any spaces yet!</p>
+            <Button class="btn btn-primary" onclick={addSpace}>
+              <Icon icon={AddCircle} />
+              Add a Space
+            </Button>
+          </div>
+        {/each}
+      {/await}
     {/each}
   </PageContent>
 </Page>