diff --git a/app/templates/base.html b/app/templates/base.html
index 8b7b4b3..bb0fb20 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -104,6 +104,7 @@
       </button>
     </div>
 
+    <div class="sidebar-scroll">
     <!-- Workspace -->
     <div class="sidebar-section">
       <div class="sidebar-section-header" @click="toggleSection('workspace')">
@@ -329,6 +330,7 @@
         <button class="sidebar-footer-btn" style="width:36px; justify-content:center;" @click="toggleTheme()">🌓</button>
       </div>
     </div>
+    </div><!-- /sidebar-scroll -->
   </aside>
 
   <!-- Uncollapse button (visible when sidebar hidden) -->
diff --git a/app/templates/local_workspace.html b/app/templates/local_workspace.html
index 843280d..e943bc4 100644
--- a/app/templates/local_workspace.html
+++ b/app/templates/local_workspace.html
@@ -907,7 +907,7 @@ document.addEventListener('alpine:init', function() {
     },
 
     async navigateToRoot() {
-      this.folderStack = [{id: 0, name: 'Root'}];
+      this.folderStack = [];
       this.navIndex = 0;
       this._saveExpandedState();
       await this._loadFolder(0);
@@ -980,15 +980,7 @@ document.addEventListener('alpine:init', function() {
         this.loaded = true;
         // Initialize folder stack from breadcrumb
         this.folderStack = (this.breadcrumb || []).map(function(b) { return {id: b.id, name: b.name}; });
-        if (this.currentFolder && this.currentFolder > 0 && this.folderStack.length === 0) {
-          this.folderStack = [{id: 0, name: 'Root'}];
-          // Add current folder name from tree if present
-          if (this.tree.length > 0) {
-            // The current folder's children are in breadcrumb, parent is the last
-          }
-        }
         this.navIndex = this.folderStack.length > 0 ? this.folderStack.length - 1 : 0;
-        if (this.folderStack.length === 0) this.folderStack = [{id: 0, name: 'Root'}];
         // Expose globally for renderChildren onclick handlers
         window._wsData = this;
         // Listen for online/offline
diff --git a/static/css/app.css b/static/css/app.css
index 53985ec..605ba99 100644
--- a/static/css/app.css
+++ b/static/css/app.css
@@ -114,10 +114,14 @@ input, select, textarea { font-family: inherit; color: inherit; }
   background: var(--bg-sidebar);
   display: flex;
   flex-direction: column;
-  overflow-y: auto;
-  overflow-x: hidden;
+  overflow: visible;
   flex-shrink: 0;
   user-select: none;
+}
+.sidebar-scroll {
+  flex: 1;
+  overflow-y: auto;
+  overflow-x: hidden;
   padding-bottom: var(--space-sm);
 }