diff --git a/index.html b/index.html
index 2ef36a0f2..c3e5b5e27 100644
--- a/index.html
+++ b/index.html
@@ -75,6 +75,25 @@
   </head>
 
   <body>
+    <div
+      id="loading"
+      style="
+        position: fixed;
+        inset: 0;
+        z-index: 999;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        background-color: var(--color-surface-base);
+        color: var(--color-text-primary);
+      ">
+      <svg width="52" height="52" viewBox="0 0 16 16" fill="currentColor">
+        <path
+          d="M16 12H8V4H16V12ZM12 5.36035C10.542 5.36037 9.36035 6.54296 9.36035 8.00098C9.36051 9.45886 10.5421 10.6406 12 10.6406C13.4579 10.6406 14.6395 9.45887 14.6396 8.00098C14.6396 6.54294 13.458 5.36035 12 5.36035Z" />
+        <path
+          d="M1.87988 8.00012C1.87988 6.82928 2.82903 5.88013 3.99988 5.88013C5.17072 5.88013 6.11987 6.82928 6.11987 8.00012C6.11987 9.17097 5.17072 10.1201 3.99988 10.1201C2.82903 10.1201 1.87988 9.17097 1.87988 8.00012Z" />
+      </svg>
+    </div>
     <script type="module" src="/src/main.ts"></script>
   </body>
 </html>
diff --git a/src/App.svelte b/src/App.svelte
index 12b509725..c1f50eb6e 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -5,7 +5,6 @@
 
   import { listen } from "@tauri-apps/api/event";
   import { getCurrentWindow } from "@tauri-apps/api/window";
-  import delay from "lodash/delay";
   import { onDestroy, onMount } from "svelte";
   import { get } from "svelte/store";
 
@@ -49,7 +48,6 @@
   import ExternalLink from "./components/ExternalLink.svelte";
   import FullscreenModalPortal from "./components/FullscreenModalPortal.svelte";
   import FullWindowError from "./components/FullWindowError.svelte";
-  import Spinner from "./components/Spinner.svelte";
 
   const activeRouteStore = router.activeRouteStore;
 
@@ -93,8 +91,11 @@
 
   let profile = $state<Config>();
 
-  let showSpinner = $state(false);
-  delay(() => (showSpinner = true), 1000);
+  $effect(() => {
+    if ($activeRouteStore.resource !== "booting" || startup.error) {
+      document.getElementById("loading")?.remove();
+    }
+  });
 
   onMount(async () => {
     try {
@@ -146,12 +147,6 @@
 </script>
 
 <style>
-  .spinner {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    height: 100%;
-  }
   .layout {
     display: grid;
     grid-template-columns: auto 1fr;
@@ -206,8 +201,6 @@
         <Command styleWidth="30rem" command="rad cob migrate" />
       </div>
     </FullWindowError>
-  {:else if showSpinner}
-    <div class="spinner"><Spinner /></div>
   {/if}
 {:else}
   <div class="layout">