diff --git a/web/src/app.css b/web/src/app.css
index 0d805ca..24dd470 100644
--- a/web/src/app.css
+++ b/web/src/app.css
@@ -30,6 +30,9 @@
 	--dark-error-background: #4b0000e0;
 	--dark-success-text: #adfcaa;
 	--dark-success-background: #004b0ae0;
+
+	--sidebar-expanded-width: 19.5rem; /* w-64 + w-14 */
+	--sidebar-collapsed-width: 3.5rem; /* w-14 */
 }
 
 /* Scrollbar width */
@@ -265,14 +268,31 @@
 	/*     Sidebar     */
 	/* * * * * * * * * */
 
+	.outer-sidebar-container {
+		@apply relative z-10 flex h-full transition-all duration-200 ease-in-out;
+	}
+
+	.sidebar-expanded {
+		@apply w-[var(--sidebar-expanded-width)];
+	}
+
+	.sidebar-collapsed {
+		@apply w-[var(--sidebar-collapsed-width)];
+	}
+
 	.mini-sidebar {
-		@apply flex w-14 flex-col items-center border-r border-[var(--light-accent)]/20 bg-[var(--light-foreground)] py-4;
+		/* Higher Z-value than the actual sidebar so that this stays always on top of it */
+		@apply z-10 flex w-14 min-w-14 flex-col items-center border-r border-[var(--light-accent)]/20 bg-[var(--light-foreground)] py-4;
 	}
 
 	.dark .mini-sidebar {
 		@apply border-[var(--dark-accent)]/20 bg-[var(--dark-foreground)];
 	}
 
+	.mini-sidebar-button-container {
+		@apply mt-6 flex flex-col gap-4 transition-all duration-200 ease-in-out;
+	}
+
 	.sidebar-button {
 		@apply flex h-8 w-8 items-center justify-center rounded-lg border border-[var(--light-accent)] bg-transparent p-0 text-[var(--light-text)] hover:bg-[var(--light-background)]/80;
 	}
@@ -282,7 +302,7 @@
 	}
 
 	.sidebar {
-		@apply z-10 flex h-full flex-col overflow-hidden border-r border-[var(--light-accent)]/20 bg-[var(--light-foreground)] transition-all duration-300 ease-in-out;
+		@apply z-10 flex h-full flex-col overflow-hidden border-r border-[var(--light-accent)]/20 bg-[var(--light-foreground)] transition-all duration-200 ease-in-out;
 	}
 
 	.dark .sidebar {
@@ -291,18 +311,21 @@
 
 	/* Take up full screen width on mobile */
 	@media (max-width: 768px) {
-		.sidebar {
-			/* Max width must take into account width of "mini sidebar" */
-			@apply w-[calc(100vw-3.5rem)];
+		.outer-sidebar-container {
+			@apply w-auto;
 		}
 
-		body.sidebar-open {
+		.sidebar {
+			@apply absolute left-[var(--sidebar-collapsed-width)] max-w-[calc(100vw-var(--sidebar-collapsed-width))] min-w-[calc(100vw-var(--sidebar-collapsed-width))];
+		}
+
+		body.sidebar-expanded {
 			@apply overflow-hidden;
 		}
 	}
 
 	/* 16rem width on desktop or equivalent screens */
-	@media (min-width: 768px) {
+	@media (min-width: 769px) {
 		.sidebar {
 			@apply w-64;
 		}
@@ -440,24 +463,22 @@
 		@apply bg-[var(--dark-background)];
 	}
 
-	/* Minimize wasted screen height on short displays */
-	@media (max-width: 768px) {
-		.main-content {
-			@apply pb-2;
-		}
-	}
-
 	.content-wrapper {
-		@apply flex h-screen flex-1 flex-col overflow-hidden py-12;
+		@apply ml-0 flex h-screen flex-1 flex-col overflow-hidden py-12 transition-all duration-200 ease-in-out;
 	}
 
 	.note-content-fixed-width {
 		@apply mx-auto flex h-full w-full max-w-[800px] flex-col px-8 py-0;
 	}
 
+	/* Minimize wasted screen space on generally small displays */
 	@media (max-width: 768px) {
+		.main-content {
+			@apply pb-2;
+		}
+
 		.content-wrapper {
-			@apply py-0;
+			@apply ml-[var(--mini-sidebar-width)] py-0;
 		}
 
 		.note-content-fixed-width {
diff --git a/web/src/lib/components/NoteView.svelte b/web/src/lib/components/NoteView.svelte
index dca0859..4e0f0a1 100644
--- a/web/src/lib/components/NoteView.svelte
+++ b/web/src/lib/components/NoteView.svelte
@@ -284,7 +284,7 @@
 		/>
 
 		<!-- Main content area -->
-		<div class="content-wrapper ml-0 transition-all duration-300">
+		<div class="content-wrapper">
 			<!-- Note content area with fixed width -->
 			<div class="note-content-fixed-width">
 				<main class="main-content">
diff --git a/web/src/lib/components/Sidebar.svelte b/web/src/lib/components/Sidebar.svelte
index a3cf897..e350c23 100644
--- a/web/src/lib/components/Sidebar.svelte
+++ b/web/src/lib/components/Sidebar.svelte
@@ -70,7 +70,11 @@
 <!-- TODO: handle pagination support later if it becomes an issue (`util/itemPagination.ts`) -->
 
 <!-- Outmost sidebar container with collapsible functionality -->
-<div class="relative z-10 flex h-full">
+<div
+	class="outer-sidebar-container"
+	class:sidebar-expanded={isSidebarOpen}
+	class:sidebar-collapsed={!isSidebarOpen}
+>
 	<!-- Collapsed mini sidebar (always visible) -->
 	<div class="mini-sidebar">
 		<button
@@ -87,7 +91,7 @@
 
 		<!-- Mini sidebar icons -->
 		{#if !isSidebarOpen}
-			<div class="mt-6 flex flex-col gap-4">
+			<div class="mini-sidebar-button-container">
 				<button on:click={createNewNote} class="sidebar-button" aria-label="Create new note">
 					<Create classString="h-5 w-5" />
 				</button>
@@ -117,7 +121,10 @@
 		class="sidebar"
 		class:translate-x-0={isSidebarOpen}
 		class:translate-x-[-100%]={!isSidebarOpen}
-		class:hidden={!isSidebarOpen}
+		class:opacity-100={isSidebarOpen}
+		class:opacity-0={!isSidebarOpen}
+		class:pointer-events-none={!isSidebarOpen}
+		class:pointer-events-auto={isSidebarOpen}
 		class:md:relative={true}
 	>
 		<!-- Header with app logo and display name -->