diff --git a/app/assets/javascripts/discourse/app/templates/components/sidebar.hbs b/app/assets/javascripts/discourse/app/templates/components/sidebar.hbs
index 1f1e8160fa3..43699359aea 100644
--- a/app/assets/javascripts/discourse/app/templates/components/sidebar.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/sidebar.hbs
@@ -1,14 +1,16 @@
 {{#d-section pageClass="has-sidebar" class="sidebar-wrapper"}}
   <div class="sidebar-container">
-    <Sidebar::TopicsSection />
-    <Sidebar::CategoriesSection />
+    <div class="sidebar-scroll-wrap">
+      <Sidebar::TopicsSection />
+      <Sidebar::CategoriesSection />
 
-    {{#if this.siteSettings.tagging_enabled}}
-      <Sidebar::TagsSection />
-    {{/if}}
+      {{#if this.siteSettings.tagging_enabled}}
+        <Sidebar::TagsSection />
+      {{/if}}
 
-    {{#if this.siteSettings.enable_personal_messages}}
-      <Sidebar::MessagesSection />
-    {{/if}}
+      {{#if this.siteSettings.enable_personal_messages}}
+        <Sidebar::MessagesSection />
+      {{/if}}
+    </div>
   </div>
 {{/d-section}}
diff --git a/app/assets/stylesheets/common/base/sidebar.scss b/app/assets/stylesheets/common/base/sidebar.scss
index 1109790e77c..583d9a1fb82 100644
--- a/app/assets/stylesheets/common/base/sidebar.scss
+++ b/app/assets/stylesheets/common/base/sidebar.scss
@@ -44,7 +44,36 @@
     box-sizing: border-box;
     height: 100%;
     width: 240px;
-    padding: 1em 0.5em 1em 0;
+    padding: 1em 0;
+    overflow-x: hidden;
+    overflow-y: auto;
+
+    // custom scrollbar styling
+    --scrollbarBg: transparent;
+    --scrollbarThumbBg: var(--primary-low);
+    --scrollbarWidth: 1em;
+
+    scrollbar-color: transparent var(--scrollbarBg);
+    transition: scrollbar-color 0.2s ease-in-out;
+    &::-webkit-scrollbar-thumb {
+      background-color: transparent;
+      border-radius: calc(var(--scrollbarWidth) / 2);
+      border: calc(var(--scrollbarWidth) / 4) solid var(--primary-very-low);
+    }
+    &:hover {
+      scrollbar-color: var(--scrollbarThumbBg) var(--scrollbarBg);
+      &::-webkit-scrollbar-thumb {
+        background-color: var(--scrollbarThumbBg);
+      }
+    }
+    &::-webkit-scrollbar {
+      width: var(--scrollbarWidth);
+    }
+  }
+
+  .sidebar-scroll-wrap {
+    // limit the wrapper width, so when the scrollbar is added the content doesn't shift
+    max-width: calc(var(--d-sidebar-width) - var(--scrollbarWidth));
   }
 
   .sidebar-toggle {