diff --git a/app/frontend/static/assets/css/crafty.css b/app/frontend/static/assets/css/crafty.css
index a04d2542..2d97d90e 100644
--- a/app/frontend/static/assets/css/crafty.css
+++ b/app/frontend/static/assets/css/crafty.css
@@ -8,6 +8,26 @@
     color: var(--base-text)
 }
 
+nav.sidebar {
+    position: fixed;
+}
+
+
+@media (min-width: 992px) {
+    nav.sidebar {
+        position: fixed;
+        max-height: auto;
+    }
+
+    .main-panel {
+        margin-left: 270px;
+    }
+
+    .sidebar-icon-only .main-panel {
+        margin-left: 70px;
+    }
+}
+
 
 .sidebar>.nav>.nav-item:not(.nav-profile)>.nav-link:before {
     content: none;
diff --git a/app/frontend/templates/main_menu.html b/app/frontend/templates/main_menu.html
index f6fba68e..98bf2082 100644
--- a/app/frontend/templates/main_menu.html
+++ b/app/frontend/templates/main_menu.html
@@ -56,11 +56,9 @@
     if (isExtraLargeBreakpoint()) {
       let value = localStorage.getItem('crafty-sidebar-expanded') !== 'false';
       $('body').toggleClass('sidebar-icon-only', !value);
-      $('body').toggleClass('sidebar-fixed', true);
       localStorage.setItem('crafty-sidebar-expanded', value);
     } else if (isLargeBreakpoint()) {
       $('body').toggleClass('sidebar-icon-only', true);
-      $('body').toggleClass('sidebar-fixed', true);
     }
   }
 </script>