diff --git a/src/app/components/LogInBunker.svelte b/src/app/components/LogInBunker.svelte
index 5118ec3a..d72d4807 100644
--- a/src/app/components/LogInBunker.svelte
+++ b/src/app/components/LogInBunker.svelte
@@ -77,6 +77,7 @@
         controller.stop()
 
         loginWithNip46(pubkey, clientSecret, signerPubkey, relays)
+        setChecked("*")
       } else {
         return pushToast({
           theme: "error",
diff --git a/src/app/components/PrimaryNavSpaces.svelte b/src/app/components/PrimaryNavSpaces.svelte
index 7570e9e7..c89d080b 100644
--- a/src/app/components/PrimaryNavSpaces.svelte
+++ b/src/app/components/PrimaryNavSpaces.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
   import {splitAt} from "@welshman/lib"
   import Widget from "@assets/icons/widget-4.svg?dataurl"
-  import Compass from "@assets/icons/compass.svg?dataurl"
   import ImageIcon from "@lib/components/ImageIcon.svelte"
   import Divider from "@lib/components/Divider.svelte"
   import PrimaryNavItem from "@lib/components/PrimaryNavItem.svelte"
@@ -35,11 +34,9 @@
       href="/spaces"
       title="All Spaces"
       class="tooltip-right"
+      prefix="no-highlight"
       notification={otherSpaceNotifications}>
       <ImageIcon alt="All Spaces" src={Widget} size={8} />
     </PrimaryNavItem>
-    <PrimaryNavItem title="Add a Space" href="/spaces" class="tooltip-right">
-      <ImageIcon alt="Add a Space" src={Compass} size={8} />
-    </PrimaryNavItem>
   {/each}
 </div>
diff --git a/src/lib/components/Dialog.svelte b/src/lib/components/Dialog.svelte
index 52381ee4..261cce23 100644
--- a/src/lib/components/Dialog.svelte
+++ b/src/lib/components/Dialog.svelte
@@ -36,6 +36,13 @@
       },
     ),
   )
+
+  const buttonClass = $derived(
+    cx("absolute right-3 btn btn-circle btn-neutral btn-sm", {
+      "top-3": fullscreen,
+      "-top-4": !fullscreen,
+    }),
+  )
 </script>
 
 <div class="center fixed inset-0 z-modal">
@@ -49,9 +56,7 @@
   <div class={wrapperClass}>
     <div class={innerClass} transition:fly>
       {#if !noEscape}
-        <Button
-          class="absolute -top-4 right-3 btn btn-circle btn-neutral btn-sm"
-          onclick={clearModals}>
+        <Button class={buttonClass} onclick={clearModals}>
           <Icon icon={Close} size={6} />
         </Button>
       {/if}