diff --git a/build/scss/_layout.scss b/build/scss/_layout.scss
index 88530dcd1..7a8229c22 100644
--- a/build/scss/_layout.scss
+++ b/build/scss/_layout.scss
@@ -580,7 +580,7 @@ body:not(.layout-fixed) {
     .control-sidebar-content {
       height: calc(100vh - #{$main-header-height});
       overflow-y: auto;
-      scrollbar-width: thin;
+      @include scrollbar-width-thin();
     }
   }
 }
diff --git a/build/scss/_main-sidebar.scss b/build/scss/_main-sidebar.scss
index e8b65283a..d9e0f6c24 100644
--- a/build/scss/_main-sidebar.scss
+++ b/build/scss/_main-sidebar.scss
@@ -19,12 +19,13 @@
 
 .sidebar {
   height: calc(100% - (#{$main-header-height-inner} + #{$main-header-bottom-border-width}));
+  overflow-x: none;
   overflow-y: initial;
-  scrollbar-width: thin;
   padding-bottom: $sidebar-padding-y;
   padding-left: $sidebar-padding-x;
   padding-right: $sidebar-padding-x;
   padding-top: $sidebar-padding-y;
+  @include scrollbar-width-thin();
 }
 
 // Sidebar user panel
diff --git a/build/scss/_sidebar-mini.scss b/build/scss/_sidebar-mini.scss
index e853745cf..e25acdba8 100644
--- a/build/scss/_sidebar-mini.scss
+++ b/build/scss/_sidebar-mini.scss
@@ -415,6 +415,13 @@
             }
           }
         }
+        .sidebar {
+          @include scrollbar-width-thin();
+        }
+      }
+
+      .sidebar {
+        @include scrollbar-width-none();
       }
     }
 
diff --git a/build/scss/mixins/_miscellaneous.scss b/build/scss/mixins/_miscellaneous.scss
index 5b474dd5f..9d7f46244 100644
--- a/build/scss/mixins/_miscellaneous.scss
+++ b/build/scss/mixins/_miscellaneous.scss
@@ -30,3 +30,13 @@
   background-image: gradient(linear, left bottom, left top, color-stop(0, $start), color-stop(1, $stop));
 }
 
+@mixin scrollbar-width-thin() {
+  scrollbar-width: thin;
+  scrollbar-color: #a9a9a9 transparent;
+}
+
+@mixin scrollbar-width-none() {
+  scrollbar-width: none;
+}
+
+//
diff --git a/build/scss/mixins/_sidebar.scss b/build/scss/mixins/_sidebar.scss
index 161a506f4..907bfd9fc 100644
--- a/build/scss/mixins/_sidebar.scss
+++ b/build/scss/mixins/_sidebar.scss
@@ -25,7 +25,6 @@
   .nav-sidebar > .nav-header,
   .nav-sidebar .nav-link {
     white-space: nowrap;
-    overflow: hidden;
   }
 
   // When the sidebar is collapsed...