diff --git a/ts/graphs/GraphsPage.svelte b/ts/graphs/GraphsPage.svelte
index 61e28053b..f2358181b 100644
--- a/ts/graphs/GraphsPage.svelte
+++ b/ts/graphs/GraphsPage.svelte
@@ -4,7 +4,6 @@
 
 <script lang="typescript">
     import RangeBox from './RangeBox.svelte'
-    import { afterUpdate } from 'svelte';
 
     import type { I18n } from "anki/i18n";
     import type pb from "anki/backend_proto";
@@ -18,50 +17,40 @@
     export let days: number;
     export let withRangeBox: boolean;
 
-    let dataPromise: Promise<pb.backend.GraphsOut>;
+    let sourceData: pb.BackendProto.GraphsOut | null = null;
     let revlogRange: RevlogRange;
 
-    const refreshWith = (search, days, revlogRange) => {
-        dataPromise = getGraphData(search, days);
-        revlogRange = days > 365
+    const refreshWith = async (search: string, days: number) => {
+        try {
+            sourceData = await getGraphData(search, days);
+            revlogRange = days > 365
                 ? RevlogRange.All
                 : RevlogRange.Year;
+        } catch (e) {
+            sourceData = null;
+            alert(i18n.tr(i18n.TR.STATISTICS_ERROR_FETCHING));
+        }
     }
 
-    const refresh = (event) => {
+    let active = false;
+
+    const refresh = (event: CustomEvent) => {
+        active = true;
         refreshWith(event.detail.search, event.detail.days)
+        active = false;
     }
 
     refreshWith(search, days)
-
-    let spinner: HTMLDivElement;
-    let graphsContainer: HTMLDivElement;
-
-    afterUpdate(() => {
-        // make sure graph container retains its size for spinner
-        if (spinner) {
-            graphsContainer.style.minHeight = `${document.documentElement.scrollHeight}px`;
-        }
-        else {
-            graphsContainer.style.minHeight = '';
-        }
-    })
 </script>
 
 {#if withRangeBox}
-    <RangeBox {i18n} {search} {days} on:update={refresh} />
+    <RangeBox {i18n} {search} {days} {active} on:update={refresh} />
 {/if}
 
-<div bind:this={graphsContainer} tabindex="-1" class="no-focus-outline">
-    {#await dataPromise}
-        <div bind:this={spinner} class="spin">◐</div>
-    {:then sourceData}
-            {#each graphs as Graph}
-                <Graph {sourceData} {revlogRange} {i18n} {nightMode} />
-            {/each}
-    {:catch error}
-        <script>
-            alert({i18n.tr(i18n.TR.STATISTICS_ERROR_FETCHING)});
-        </script>
-    {/await}
-</div>
+{#if sourceData}
+    <div tabindex="-1" class="no-focus-outline">
+        {#each graphs as Graph}
+            <Graph {sourceData} {revlogRange} {i18n} {nightMode} />
+        {/each}
+    </div>
+{/if}
diff --git a/ts/graphs/RangeBox.svelte b/ts/graphs/RangeBox.svelte
index ca18750d3..2d10ca2aa 100644
--- a/ts/graphs/RangeBox.svelte
+++ b/ts/graphs/RangeBox.svelte
@@ -1,6 +1,7 @@
 <script lang="typescript">
     import { createEventDispatcher } from 'svelte';
 
+    import type { I18n } from "anki/i18n";
     import { RevlogRange } from "./graph-helpers";
 
     enum SearchRange {
@@ -10,14 +11,23 @@
     }
 
     export let i18n: I18n;
+    export let active: boolean;
+
+    export let days: number;
+    export let search: string;
 
     const dispatch = createEventDispatcher();
 
-    let revlogRange: RevlogRange = RevlogRange.Year;
-    let searchRange: SearchRange = SearchRange.Deck;
+    let revlogRange: RevlogRange = days <= 365
+        ? RevlogRange.Year
+        : RevlogRange.All;
+
+    let searchRange: SearchRange = search === "deck:current"
+        ? SearchRange.Deck
+        : search === ""
+        ? SearchRange.Collection
+        : SearchRange.Custom;
 
-    let days;
-    let search;
     let displayedSearch = search;
 
     const update = () => {
@@ -71,6 +81,8 @@
 
 
 <div class="range-box">
+    <div class="spin" class:active>◐</div>
+
     <div class="range-box-inner">
         <label>
             <input type="radio" bind:group={searchRange} value={SearchRange.Deck} />
diff --git a/ts/graphs/graphs.scss b/ts/graphs/graphs.scss
index fd5bf9d8a..ca940f0f7 100644
--- a/ts/graphs/graphs.scss
+++ b/ts/graphs/graphs.scss
@@ -144,16 +144,18 @@
 }
 
 .spin {
-    position: sticky;
-    left: 50%;
-    top: 50%;
-
+    position: absolute;
     animation: spin;
     animation-duration: 1s;
     animation-iteration-count: infinite;
     display: inline-block;
     font-size: 2em;
+    opacity: 0;
+}
+
+.spin.active {
     opacity: 0.5;
+    transition: opacity 1s;
 }
 
 .legend-outer {