diff --git a/src/lib/components/GnomeMenuBar.svelte b/src/lib/components/GnomeMenuBar.svelte
new file mode 100644
index 0000000..b35cf3f
--- /dev/null
+++ b/src/lib/components/GnomeMenuBar.svelte
@@ -0,0 +1,155 @@
+<script lang="ts">
+	import { accountSetup } from '$lib/atproto/setup.svelte';
+	import { repoBrowser } from '$lib/atproto/repo.svelte';
+	import { desktopSession } from '$lib/desktop-session.svelte';
+	import { windowManager } from '$lib/window-manager.svelte';
+	import GnomeTry from '$lib/components/GnomeTry.svelte';
+
+	function changeAccount() {
+		windowManager.close('gedit');
+		repoBrowser.reset();
+		accountSetup.reset();
+	}
+</script>
+
+<nav class="panel-menus" aria-label="System menus">
+	<button class="applications-menu" type="button">
+		<img src="/icons/humanity/apps/system-file-manager.svg" alt="" width="20" height="20" />
+		<span>Applications</span>
+	</button>
+
+	<details class="panel-menu">
+		<summary>Places</summary>
+		<div class="menu-popover places-popover">
+			<p class="menu-heading">Collections</p>
+			{#if repoBrowser.collections.length > 0}
+				{#each repoBrowser.collections.slice(0, 10) as collection (collection.name)}
+					<button
+						type="button"
+						onclick={() =>
+							accountSetup.identity && repoBrowser.selectCollection(accountSetup.identity, collection.name)}>
+						<img src={collection.icon} alt="" width="16" height="16" />
+						<span>{collection.name}</span>
+					</button>
+				{/each}
+			{:else}
+				<span class="menu-empty">Collections appear here after setup.</span>
+			{/if}
+		</div>
+	</details>
+
+	<details class="panel-menu">
+		<summary>System</summary>
+		<div class="menu-popover system-popover">
+			{#if accountSetup.identity}
+				<p class="menu-heading">Signed in as @{accountSetup.identity.handle}</p>
+			{/if}
+			<button type="button" onclick={() => desktopSession.lock()}>
+				<img src="/icons/humanity/status/network-wireless-encrypted.svg" alt="" width="16" height="16" />
+				<span>Lock Screen</span>
+			</button>
+			<button type="button" onclick={changeAccount}>
+				<img src="/icons/humanity/places/user-home.svg" alt="" width="16" height="16" />
+				<span>Change Account…</span>
+			</button>
+		</div>
+	</details>
+</nav>
+
+<GnomeTry />
+
+<style>
+	.panel-menus {
+		display: flex;
+		align-items: center;
+		gap: 1px;
+	}
+
+	.panel-menus button,
+	.panel-menus summary {
+		display: inline-flex;
+		align-items: center;
+		gap: var(--space-1);
+		height: 1.35rem;
+		padding: 0 var(--space-2);
+		border: 1px solid transparent;
+		border-radius: var(--radius-1);
+		cursor: default;
+	}
+
+	.panel-menus button:hover,
+	.panel-menus summary:hover,
+	.panel-menu[open] summary {
+		background: rgb(255 238 203 / 0.16);
+		border-color: rgb(255 255 255 / 0.18) rgb(0 0 0 / 0.35) rgb(0 0 0 / 0.45) rgb(255 255 255 / 0.16);
+	}
+
+	.panel-menu {
+		position: relative;
+	}
+
+	.panel-menu summary {
+		list-style: none;
+	}
+
+	.panel-menu summary::-webkit-details-marker {
+		display: none;
+	}
+
+	.menu-popover {
+		position: absolute;
+		top: calc(100% + 3px);
+		left: 0;
+		display: grid;
+		gap: 1px;
+		min-width: 17rem;
+		padding: var(--space-1);
+		color: var(--text);
+		background: linear-gradient(#f4e6cc, #cfb58c);
+		border: 1px solid #4d2c17;
+		z-index: 1;
+		box-shadow: 0 10px 22px rgb(0 0 0 / 0.42);
+		text-shadow: none;
+	}
+
+	.menu-popover button {
+		justify-content: flex-start;
+		width: 100%;
+		height: 1.6rem;
+		color: var(--text);
+	}
+
+	.menu-popover button:hover {
+		color: white;
+		background: var(--selection);
+		border-color: transparent;
+	}
+
+	.menu-popover span {
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+
+	.menu-heading,
+	.menu-empty {
+		padding: var(--space-1) var(--space-2);
+		color: var(--text-muted);
+		font-size: var(--text-0);
+		font-weight: 700;
+	}
+
+	.system-popover {
+		min-width: 13rem;
+	}
+
+	.applications-menu {
+		font-weight: 650;
+	}
+
+	@media (max-width: 760px) {
+		.panel-menus .panel-menu {
+			display: none;
+		}
+	}
+</style>
diff --git a/src/lib/components/GnomePanel.svelte b/src/lib/components/GnomePanel.svelte
index b8bf799..7d3d42a 100644
--- a/src/lib/components/GnomePanel.svelte
+++ b/src/lib/components/GnomePanel.svelte
@@ -1,61 +1,16 @@
 <script lang="ts">
-	import { accountSetup } from '$lib/atproto/setup.svelte';
-	import { repoBrowser } from '$lib/atproto/repo.svelte';
 	import { windowManager } from '$lib/window-manager.svelte';
+	import GnomeMenuBar from '$lib/components/GnomeMenuBar.svelte';
 
 	const launchers = [
 		{ label: 'Browser', icon: '/icons/humanity/apps/web-browser.svg' },
 		{ label: 'Mail', icon: '/icons/humanity/apps/evolution-mail.svg' },
 		{ label: 'Terminal', icon: '/icons/humanity/apps/utilities-terminal.svg' }
 	];
-
-	function changeAccount() {
-		windowManager.close('gedit');
-		repoBrowser.reset();
-		accountSetup.reset();
-	}
 </script>
 
 <header class="gnome-panel" aria-label="GNOME top panel">
-	<nav class="panel-menus" aria-label="System menus">
-		<button class="applications-menu" type="button">
-			<img src="/icons/humanity/apps/system-file-manager.svg" alt="" width="20" height="20" />
-			<span>Applications</span>
-		</button>
-
-		<details class="panel-menu">
-			<summary>Places</summary>
-			<div class="menu-popover places-popover">
-				<p class="menu-heading">Collections</p>
-				{#if repoBrowser.collections.length > 0}
-					{#each repoBrowser.collections.slice(0, 10) as collection (collection.name)}
-						<button
-							type="button"
-							onclick={() =>
-								accountSetup.identity && repoBrowser.selectCollection(accountSetup.identity, collection.name)}>
-							<img src={collection.icon} alt="" width="16" height="16" />
-							<span>{collection.name}</span>
-						</button>
-					{/each}
-				{:else}
-					<span class="menu-empty">Collections appear here after setup.</span>
-				{/if}
-			</div>
-		</details>
-
-		<details class="panel-menu">
-			<summary>System</summary>
-			<div class="menu-popover system-popover">
-				{#if accountSetup.identity}
-					<p class="menu-heading">Signed in as @{accountSetup.identity.handle}</p>
-				{/if}
-				<button type="button" onclick={changeAccount}>
-					<img src="/icons/humanity/places/user-home.svg" alt="" width="16" height="16" />
-					<span>Change Account…</span>
-				</button>
-			</div>
-		</details>
-	</nav>
+	<GnomeMenuBar />
 
 	<div class="panel-launchers" aria-label="Launchers">
 		{#each launchers as launcher (launcher.label)}
@@ -79,28 +34,12 @@
 			</button>
 		{/each}
 	</section>
-
-	<aside class="panel-tray" aria-label="Status tray">
-		{#if accountSetup.identity}
-			<button class="account-chip" type="button" onclick={changeAccount} title="Change account">
-				{#if accountSetup.identity.avatar}
-					<img src={accountSetup.identity.avatar} alt="" width="16" height="16" />
-				{:else}
-					<img src="/icons/humanity/places/user-home.svg" alt="" width="16" height="16" />
-				{/if}
-				<span>@{accountSetup.identity.handle}</span>
-			</button>
-		{/if}
-		<img src="/icons/humanity/status/network-wireless-encrypted.svg" alt="Network connected" width="16" height="16" />
-		<img src="/icons/humanity/status/audio-volume-medium.svg" alt="Volume" width="16" height="16" />
-		<time datetime="2008-10-30T10:10">Thu Oct 30, 10:10 AM</time>
-	</aside>
 </header>
 
 <style>
 	.gnome-panel {
 		position: relative;
-		z-index: 10;
+		z-index: 9000;
 		display: flex;
 		align-items: center;
 		gap: var(--space-2);
@@ -117,23 +56,14 @@
 		text-shadow: 0 1px 0 rgb(0 0 0 / 0.75);
 	}
 
-	.panel-menus,
 	.panel-launchers,
-	.panel-tray,
 	.window-list {
 		display: flex;
 		align-items: center;
 	}
 
-	.panel-menus {
-		gap: 1px;
-	}
-
-	.panel-menus button,
-	.panel-menus summary,
 	.panel-launchers button,
-	.active-window,
-	.account-chip {
+	.active-window {
 		display: inline-flex;
 		align-items: center;
 		gap: var(--space-1);
@@ -144,77 +74,11 @@
 		cursor: default;
 	}
 
-	.panel-menus button:hover,
-	.panel-menus summary:hover,
-	.panel-menu[open] summary,
-	.panel-launchers button:hover,
-	.account-chip:hover {
+	.panel-launchers button:hover {
 		background: rgb(255 238 203 / 0.16);
 		border-color: rgb(255 255 255 / 0.18) rgb(0 0 0 / 0.35) rgb(0 0 0 / 0.45) rgb(255 255 255 / 0.16);
 	}
 
-	.panel-menu {
-		position: relative;
-	}
-
-	.panel-menu summary {
-		list-style: none;
-	}
-
-	.panel-menu summary::-webkit-details-marker {
-		display: none;
-	}
-
-	.menu-popover {
-		position: absolute;
-		top: calc(100% + 3px);
-		left: 0;
-		display: grid;
-		gap: 1px;
-		min-width: 17rem;
-		padding: var(--space-1);
-		color: var(--text);
-		background: linear-gradient(#f4e6cc, #cfb58c);
-		border: 1px solid #4d2c17;
-		box-shadow: 0 10px 22px rgb(0 0 0 / 0.42);
-		text-shadow: none;
-	}
-
-	.menu-popover button {
-		justify-content: flex-start;
-		width: 100%;
-		height: 1.6rem;
-		color: var(--text);
-	}
-
-	.menu-popover button:hover {
-		color: white;
-		background: var(--selection);
-		border-color: transparent;
-	}
-
-	.menu-popover span {
-		overflow: hidden;
-		text-overflow: ellipsis;
-		white-space: nowrap;
-	}
-
-	.menu-heading,
-	.menu-empty {
-		padding: var(--space-1) var(--space-2);
-		color: var(--text-muted);
-		font-size: var(--text-0);
-		font-weight: 700;
-	}
-
-	.system-popover {
-		min-width: 13rem;
-	}
-
-	.applications-menu {
-		font-weight: 650;
-	}
-
 	.panel-launchers {
 		gap: 1px;
 		padding-left: var(--space-1);
@@ -256,33 +120,8 @@
 		white-space: nowrap;
 	}
 
-	.panel-tray {
-		gap: var(--space-2);
-	}
-
-	.account-chip {
-		max-width: 12rem;
-		padding: 0 var(--space-1);
-	}
-
-	.account-chip img {
-		border-radius: var(--radius-1);
-	}
-
-	.account-chip span {
-		overflow: hidden;
-		text-overflow: ellipsis;
-		white-space: nowrap;
-	}
-
-	.panel-tray time {
-		font-variant-numeric: tabular-nums;
-	}
-
 	@media (max-width: 760px) {
-		.panel-menus .panel-menu,
-		.window-list,
-		.account-chip span {
+		.window-list {
 			display: none;
 		}
 	}
diff --git a/src/lib/components/GnomeTry.svelte b/src/lib/components/GnomeTry.svelte
new file mode 100644
index 0000000..02bb9d9
--- /dev/null
+++ b/src/lib/components/GnomeTry.svelte
@@ -0,0 +1,113 @@
+<script lang="ts">
+	import { onMount } from 'svelte';
+	import { accountSetup } from '$lib/atproto/setup.svelte';
+	import { repoBrowser } from '$lib/atproto/repo.svelte';
+	import { desktopSession } from '$lib/desktop-session.svelte';
+	import { windowManager } from '$lib/window-manager.svelte';
+
+	let now = $state(new Date());
+
+	const panelTime = $derived(
+		now.toLocaleString([], {
+			weekday: 'short',
+			month: 'short',
+			day: 'numeric',
+			hour: 'numeric',
+			minute: '2-digit',
+			second: '2-digit',
+			timeZoneName: 'short'
+		})
+	);
+
+	onMount(() => {
+		const interval = window.setInterval(() => {
+			now = new Date();
+		}, 1000);
+
+		return () => window.clearInterval(interval);
+	});
+
+	function changeAccount() {
+		windowManager.close('gedit');
+		repoBrowser.reset();
+		accountSetup.reset();
+	}
+</script>
+
+<aside class="panel-tray" aria-label="Status tray">
+	{#if accountSetup.identity}
+		<button class="account-chip" type="button" onclick={changeAccount} title="Change account">
+			{#if accountSetup.identity.avatar}
+				<img src={accountSetup.identity.avatar} alt="" width="16" height="16" />
+			{:else}
+				<img src="/icons/humanity/places/user-home.svg" alt="" width="16" height="16" />
+			{/if}
+			<span>@{accountSetup.identity.handle}</span>
+		</button>
+	{/if}
+	<button class="tray-button" type="button" onclick={() => desktopSession.lock()} title="Lock screen">
+		<img src="/icons/humanity/status/network-wireless-encrypted.svg" alt="Lock screen" width="16" height="16" />
+	</button>
+	<a class="tray-button" href="https://plyr.fm" target="_blank" rel="noopener noreferrer" title="Open plyr.fm">
+		<img src="/icons/humanity/status/audio-volume-medium.svg" alt="Open plyr.fm" width="16" height="16" />
+	</a>
+	<a class="tray-button" href="https://time.is" target="_blank">
+		<time datetime={now.toISOString()}>{panelTime}</time>
+	</a>
+</aside>
+
+<style>
+	.panel-tray {
+		order: 100;
+		display: flex;
+		align-items: center;
+		gap: var(--space-2);
+	}
+
+	.account-chip,
+	.tray-button {
+		display: inline-flex;
+		align-items: center;
+		height: 1.35rem;
+		border: 1px solid transparent;
+		border-radius: var(--radius-1);
+		cursor: default;
+	}
+
+	.account-chip {
+		gap: var(--space-1);
+		max-width: 12rem;
+		padding: 0 var(--space-1);
+	}
+
+	.tray-button {
+		justify-content: center;
+		min-width: 1.35rem;
+	}
+
+	.account-chip:hover,
+	.tray-button:hover {
+		background: rgb(255 238 203 / 0.16);
+		border-color: rgb(255 255 255 / 0.18) rgb(0 0 0 / 0.35) rgb(0 0 0 / 0.45) rgb(255 255 255 / 0.16);
+	}
+
+	.account-chip img {
+		border-radius: var(--radius-1);
+	}
+
+	.account-chip span {
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+
+	.panel-tray time {
+		font-variant-numeric: tabular-nums;
+	}
+
+	@media (max-width: 760px) {
+		.account-chip span {
+			display: none;
+		}
+	}
+</style>
diff --git a/src/lib/components/LockScreen.svelte b/src/lib/components/LockScreen.svelte
new file mode 100644
index 0000000..ea726d9
--- /dev/null
+++ b/src/lib/components/LockScreen.svelte
@@ -0,0 +1,154 @@
+<script lang="ts">
+	import { onMount } from 'svelte';
+	import favicon from '$lib/assets/favicon.svg';
+	import type { AccountIdentity } from '$lib/atproto/types';
+
+	type Props = { identity: AccountIdentity | null; onunlock: () => void };
+
+	let { identity, onunlock }: Props = $props();
+	let now = $state(new Date());
+
+	const displayName = $derived(identity ? `@${identity.handle}` : 'Intrepid Ibex');
+	const time = $derived(now.toLocaleTimeString([], { hour: 'numeric', minute: '2-digit' }));
+	const date = $derived(now.toLocaleDateString([], { weekday: 'long', month: 'long', day: 'numeric' }));
+
+	onMount(() => {
+		const interval = window.setInterval(() => {
+			now = new Date();
+		}, 1000);
+
+		return () => window.clearInterval(interval);
+	});
+</script>
+
+<section class="lock-screen" aria-label="Screen locked">
+	<div class="lock-card">
+		<div class="lock-clock" aria-live="polite">
+			<time datetime={now.toISOString()}>{time}</time>
+			<p>{date}</p>
+		</div>
+
+		<div class="lock-user">
+			{#if identity?.avatar}
+				<img class="lock-avatar" src={identity.avatar} alt="" width="56" height="56" />
+			{:else}
+				<img class="lock-avatar fallback" src={favicon} alt="" width="56" height="56" />
+			{/if}
+			<div>
+				<p class="lock-kicker">Locked</p>
+				<h1>{displayName}</h1>
+			</div>
+		</div>
+
+		<button type="button" onclick={onunlock}>Unlock</button>
+	</div>
+</section>
+
+<style>
+	.lock-screen {
+		position: fixed;
+		inset: 0;
+		z-index: 9998;
+		display: grid;
+		place-items: center;
+		color: #eeeeec;
+		background:
+			radial-gradient(circle at 50% 24%, rgb(233 84 32 / 0.2), transparent 18rem),
+			linear-gradient(rgb(48 10 36 / 0.9), rgb(48 10 36 / 0.96));
+		backdrop-filter: blur(5px);
+	}
+
+	.lock-card {
+		display: grid;
+		justify-items: center;
+		width: min(24rem, calc(100vw - 2rem));
+		padding: var(--space-8) var(--space-6);
+		text-align: center;
+	}
+
+	.lock-clock time {
+		display: block;
+		color: #eeeeec;
+		font-size: clamp(3rem, 16vw, 5.5rem);
+		font-weight: 300;
+		line-height: 0.95;
+		letter-spacing: -0.06em;
+		text-shadow: 0 0.25rem 1rem rgb(0 0 0 / 0.32);
+	}
+
+	.lock-clock p {
+		margin-top: var(--space-2);
+		color: rgb(238 238 236 / 0.76);
+		font-size: var(--text-2);
+	}
+
+	.lock-user {
+		display: inline-flex;
+		align-items: center;
+		gap: var(--space-3);
+		margin-top: var(--space-7);
+		padding: var(--space-3) var(--space-4);
+		text-align: left;
+		background: rgb(238 238 236 / 0.08);
+		border: 1px solid rgb(238 238 236 / 0.16);
+		border-radius: var(--radius-3);
+		box-shadow:
+			0 1px 0 rgb(255 255 255 / 0.12) inset,
+			0 1rem 2.2rem rgb(0 0 0 / 0.22);
+	}
+
+	.lock-avatar {
+		width: 3.5rem;
+		height: 3.5rem;
+		object-fit: cover;
+		border: 2px solid rgb(238 238 236 / 0.8);
+		border-radius: 0.8rem;
+		box-shadow: 0 0.25rem 0.8rem rgb(0 0 0 / 0.35);
+	}
+
+	.lock-avatar.fallback {
+		padding: 0.45rem;
+		object-fit: contain;
+		background: #eeeeec;
+	}
+
+	.lock-kicker,
+	.lock-user h1 {
+		color: #e95420;
+	}
+
+	.lock-kicker {
+		font-size: var(--text-0);
+		font-weight: 700;
+		letter-spacing: 0.08em;
+		text-transform: uppercase;
+	}
+
+	.lock-user h1 {
+		max-width: 14rem;
+		overflow: hidden;
+		font-size: var(--text-4);
+		line-height: var(--leading-tight);
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+
+	.lock-card button {
+		margin-top: var(--space-5);
+		padding: 0.45rem 1.15rem;
+		color: #eeeeec;
+		font: inherit;
+		font-size: var(--text-1);
+		font-weight: 700;
+		background: #e95420;
+		border: 1px solid #e95420;
+		border-radius: var(--radius-2);
+		box-shadow: 0 0.25rem 0.8rem rgb(0 0 0 / 0.25);
+	}
+
+	.lock-card button:hover,
+	.lock-card button:focus-visible {
+		background: #f06a35;
+		outline: none;
+	}
+</style>
diff --git a/src/lib/desktop-session.svelte.ts b/src/lib/desktop-session.svelte.ts
new file mode 100644
index 0000000..60ed9c0
--- /dev/null
+++ b/src/lib/desktop-session.svelte.ts
@@ -0,0 +1,13 @@
+class DesktopSessionState {
+	isLocked = $state(false);
+
+	lock() {
+		this.isLocked = true;
+	}
+
+	unlock() {
+		this.isLocked = false;
+	}
+}
+
+export const desktopSession = new DesktopSessionState();
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index f15ea5d..57d3f89 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -4,6 +4,7 @@
 	import { repoBrowser } from '$lib/atproto/repo.svelte';
 	import { accountSetup } from '$lib/atproto/setup.svelte';
 	import favicon from '$lib/assets/favicon.svg';
+	import { desktopSession } from '$lib/desktop-session.svelte';
 	import { getDatabase, resetLocalDatabase, runMigrations } from '$lib/db';
 	import { errorMessage } from '$lib/utils/errors';
 	import { windowManager } from '$lib/window-manager.svelte';
@@ -13,6 +14,7 @@
 	import DesktopIcon from '$lib/components/DesktopIcon.svelte';
 	import Gedit from '$lib/components/Gedit.svelte';
 	import GnomePanel from '$lib/components/GnomePanel.svelte';
+	import LockScreen from '$lib/components/LockScreen.svelte';
 	import NativeWindow from '$lib/components/NativeWindow.svelte';
 	import SetupDialog from '$lib/components/SetupDialog.svelte';
 	import '$lib/styles/style.css';
@@ -68,7 +70,11 @@
 		showAboutComputer = windowManager.getWindow('about-computer')?.isOpen ?? false;
 
 		if (repoBrowser.selectedRecord) {
-			windowManager.setTitle('gedit', `${repoBrowser.selectedRecord.rkey}.json - gedit`, repoBrowser.selectedRecord.icon);
+			windowManager.setTitle(
+				'gedit',
+				`${repoBrowser.selectedRecord.rkey}.json - gedit`,
+				repoBrowser.selectedRecord.icon
+			);
 		}
 	});
 
@@ -117,6 +123,8 @@
 	}
 
 	async function waitForMinimumBootTime(startedAt: number) {
+		// TODO: this should be configurable/off after migrations are done
+		// We probably need to track app version
 		const remaining = 2500 - (performance.now() - startedAt);
 
 		if (remaining > 0) {
@@ -212,6 +220,10 @@
 				</aside>
 			{/if}
 		</main>
+
+		{#if desktopSession.isLocked}
+			<LockScreen identity={accountSetup.identity} onunlock={() => desktopSession.unlock()} />
+		{/if}
 	</div>
 {/if}