diff --git a/site/src/components/PreloadingIndicator.svelte b/site/src/components/PreloadingIndicator.svelte
new file mode 100644
index 0000000000..22980e2a6b
--- /dev/null
+++ b/site/src/components/PreloadingIndicator.svelte
@@ -0,0 +1,64 @@
+<script>
+	import { onMount } from 'svelte';
+	import { fade } from 'svelte/transition';
+
+	let p = 0;
+
+	const sleep = ms => new Promise(f => setTimeout(f, ms));
+
+	onMount(() => {
+		let running = true;
+
+		function next() {
+			p += 0.1;
+
+			const remaining = 1 - p;
+			if (remaining > 0.15) setTimeout(next, 500 / remaining);
+		}
+
+		setTimeout(next, 250);
+
+		return () => {
+			running = false;
+		};
+	});
+</script>
+
+<style>
+	.progress-container {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 4px;
+		z-index: 999;
+	}
+
+	.progress {
+		position: absolute;
+		left: 0;
+		top: 0;
+		height: 100%;
+		background-color: var(--prime);
+		transition: width 0.4s;
+	}
+
+	.fade {
+		position: fixed;
+		width: 100%;
+		height: 100%;
+		background-color: rgba(255,255,255,0.3);
+		pointer-events: none;
+		z-index: 998;
+	}
+</style>
+
+{#if p > 0}
+	<div class="progress-container" transition:fade>
+		<div class="progress" style="width: {p * 100}%"></div>
+	</div>
+{/if}
+
+{#if p >= 0.4}
+	<div class="fade" in:fade={{duration:800}}></div>
+{/if}
\ No newline at end of file
diff --git a/site/src/routes/_layout.svelte b/site/src/routes/_layout.svelte
index a72065a7c2..5482ea4d46 100644
--- a/site/src/routes/_layout.svelte
+++ b/site/src/routes/_layout.svelte
@@ -1,11 +1,16 @@
 <script>
-	import { page } from '@sapper/app';
+	import { page, preloading } from '@sapper/app';
 	import InlineSvg from '../components/InlineSvg.svelte';
+	import PreloadingIndicator from '../components/PreloadingIndicator.svelte';
 	import Nav from '../components/TopNav.svelte';
 
 	export let segment;
 </script>
 
+{#if $preloading}
+	<PreloadingIndicator/>
+{/if}
+
 <InlineSvg />
 {#if $page.path !== '/repl/embed'}
 	<Nav {segment}/>