diff --git a/postcss.config.js b/postcss.config.js
index 259af96..ad7e754 100644
--- a/postcss.config.js
+++ b/postcss.config.js
@@ -27,6 +27,7 @@ export default {
 				case '.fa-brain:before':
 				case '.fa-download:before':
 				case '.fa-keyboard:before':
+				case '.fa-thumbtack:before':
 				case '.fa-brands:before':
 				case '.fa-solid:before':
 				case '.fa-regular:before':
diff --git a/src/lib/SideBar.svelte b/src/lib/SideBar.svelte
index 4efd626..bf816a2 100644
--- a/src/lib/SideBar.svelte
+++ b/src/lib/SideBar.svelte
@@ -1,4 +1,5 @@
 <script>
+	import { createEventDispatcher } from 'svelte';
 	import Icon from './Icon.svelte';
 	import InformationTab from './InformationTab.svelte';
 	import NetworkingTab from './NetworkingTab.svelte';
@@ -8,6 +9,7 @@
 	import PostsTab from './PostsTab.svelte';
 	import DiscordTab from './DiscordTab.svelte';
 	import GitHubTab from './GitHubTab.svelte';
+	import SmallButton from './SmallButton.svelte';
 	import { cpuActivity, diskActivity, aiActivity } from './activities.js';
 	const icons = [
 		{ icon: 'fas fa-info-circle', info: 'Information', activity: null },
@@ -20,8 +22,10 @@
 		{ icon: 'fab fa-discord', info: 'Discord', activity: null },
 		{ icon: 'fab fa-github', info: 'GitHub', activity: null },
 	];
+	let dispatch = createEventDispatcher();
 	let activeInfo = null; // Tracks currently visible info.
 	let hideTimeout = 0; // Timeout for hiding info panel.
+	export let sideBarPinned;
 
 	function showInfo(info) {
 		clearTimeout(hideTimeout);
@@ -29,6 +33,9 @@
 		activeInfo = info;
 	}
 	function hideInfo() {
+		// Never remove the sidebar if pinning is enabled
+		if(sideBarPinned)
+			return;
 		// Prevents multiple timers and hides the info panel after 400ms unless interrupted.
 		clearTimeout(hideTimeout);
 		hideTimeout = setTimeout(() => {
@@ -42,6 +49,8 @@
 	}
 	// Toggles the info panel for the clicked icon.
 	function handleClick(icon) {
+		if(sideBarPinned)
+			return;
 		// Hides the panel if the icon is active. Otherwise, shows the panel with info.
 		if (activeInfo === icon.info) {
 			activeInfo = null;
@@ -50,6 +59,11 @@
 		}
 	}
 
+	function toggleSidebarPin() {
+		sideBarPinned = !sideBarPinned;
+		dispatch('sidebarPinChange', sideBarPinned);
+	}
+
 	export let handleTool;
 </script>
 
@@ -70,11 +84,19 @@
 		{/each}
 	</div>
 	<div
-		class="flex flex-col gap-5 shrink-0 w-80 h-full z-10 p-2 bg-neutral-600 text-gray-100 opacity-95"
+		class="relative flex flex-col gap-5 shrink-0 w-80 h-full z-10 p-2 bg-neutral-600 text-gray-100 opacity-95"
 		class:hidden={!activeInfo}
 		on:mouseenter={handleMouseEnterPanel}
 		on:mouseleave={hideInfo}
 	>
+		<div class="absolute right-2 top-2">
+			<SmallButton
+				buttonIcon="fa-solid fa-thumbtack"
+				clickHandler={toggleSidebarPin}
+				buttonTooltip={sideBarPinned ? "Unpin Sidebar" : "Pin Sidebar"}
+				bgColor={sideBarPinned ? "bg-neutral-500" : "bg-neutral-700"}
+			/>
+		</div>
 		{#if activeInfo === 'Information'}
 			<InformationTab>
 				<slot></slot>
diff --git a/src/lib/WebVM.svelte b/src/lib/WebVM.svelte
index 2cd5402..fe571dd 100644
--- a/src/lib/WebVM.svelte
+++ b/src/lib/WebVM.svelte
@@ -1,5 +1,5 @@
 <script>
-	import { onMount } from 'svelte';
+	import { onMount, tick } from 'svelte';
 	import { get } from 'svelte/store';
 	import Nav from 'labs/packages/global-navbar/src/Nav.svelte';
 	import SideBar from '$lib/SideBar.svelte';
@@ -28,6 +28,7 @@
 	var lastScreenshot = null;
 	var screenshotCanvas = null;
 	var screenshotCtx = null;
+	var sideBarPinned = false;
 	function writeData(buf, vt)
 	{
 		if(vt != 1)
@@ -175,6 +176,10 @@
 			return;
 		curInnerWidth = window.innerWidth;
 		curInnerHeight = window.innerHeight;
+		triggerResize();
+	}
+	function triggerResize()
+	{
 		term.options.fontSize = computeXTermFontSize();
 		fitAddon.fit();
 		const display = document.getElementById("display");
@@ -615,20 +620,28 @@
 			return new Error("Error: Invalid tool syntax");
 		}
 	}
+	async function handleSidebarPinChange(event)
+	{
+		sideBarPinned = event.detail;
+		// Make sure the pinning state of reflected in the layout
+		await tick();
+		// Adjust the layout based on the new sidebar state
+		triggerResize();
+	}
 </script>
 
 <main class="relative w-full h-full">
 	<Nav />
 	<div class="absolute top-10 bottom-0 left-0 right-0">
-		<SideBar on:connect={handleConnect} on:reset={handleReset} handleTool={handleTool}>
+		<SideBar on:connect={handleConnect} on:reset={handleReset} handleTool={handleTool} on:sidebarPinChange={handleSidebarPinChange}>
 			<slot></slot>
 		</SideBar>
 		{#if configObj.needsDisplay}
-			<div class="absolute top-0 bottom-0 left-14 right-0">
+			<div class="absolute top-0 bottom-0 {sideBarPinned ? 'left-[23.5rem]' : 'left-14'} right-0">
 				<canvas class="w-full h-full cursor-none" id="display"></canvas>
 			</div>
 		{/if}
-		<div class="absolute top-0 bottom-0 left-14 right-0 p-1 scrollbar" id="console">
+		<div class="absolute top-0 bottom-0 {sideBarPinned ? 'left-[23.5rem]' : 'left-14'} right-0 p-1 scrollbar" id="console">
 		</div>
 	</div>
 </main>