diff --git a/index.html b/index.html
index 5c925758..29230a71 100644
--- a/index.html
+++ b/index.html
@@ -5,6 +5,37 @@
     <link rel="icon" type="image/svg+xml" href="/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Termix</title>
+    <style>
+      /* Custom scrollbar styles */
+      .hide-scrollbar {
+        scrollbar-width: none; /* Firefox */
+        -ms-overflow-style: none; /* IE and Edge */
+      }
+
+      .hide-scrollbar::-webkit-scrollbar {
+        display: none; /* Chrome, Safari, Opera */
+      }
+
+      .skinny-scrollbar {
+        scrollbar-width: thin; /* Firefox */
+        scrollbar-color: #4a4a4a #1e1e21; /* thumb and track color for Firefox */
+      }
+
+      .skinny-scrollbar::-webkit-scrollbar {
+        width: 6px; /* width for vertical scrollbar */
+        height: 6px; /* height for horizontal scrollbar */
+      }
+
+      .skinny-scrollbar::-webkit-scrollbar-track {
+        background: #1e1e21; /* track color */
+      }
+
+      .skinny-scrollbar::-webkit-scrollbar-thumb {
+        background-color: #4a4a4a; /* thumb color */
+        border-radius: 3px; /* roundness of the thumb */
+        border: 1px solid #1e1e21; /* border around the thumb */
+      }
+    </style>
   </head>
   <body>
     <div id="root"></div>
diff --git a/src/ui/Desktop/Apps/Dashboard/Dashboard.tsx b/src/ui/Desktop/Apps/Dashboard/Dashboard.tsx
index 0256afdc..bbecf9ae 100644
--- a/src/ui/Desktop/Apps/Dashboard/Dashboard.tsx
+++ b/src/ui/Desktop/Apps/Dashboard/Dashboard.tsx
@@ -546,7 +546,9 @@ export function Dashboard({
                         {t("dashboard.reset")}
                       </Button>
                     </div>
-                    <div className="grid gap-4 grid-cols-[repeat(auto-fit,minmax(200px,1fr))] auto-rows-min overflow-y-auto overflow-x-hidden">
+                    <div
+                      className={`grid gap-4 grid-cols-[repeat(auto-fit,minmax(200px,1fr))] auto-rows-min overflow-x-hidden ${recentActivityLoading ? "overflow-y-hidden" : "overflow-y-auto"}`}
+                    >
                       {recentActivityLoading ? (
                         <div className="flex flex-row items-center text-muted-foreground text-sm">
                           <Loader2 className="animate-spin mr-2" size={16} />
@@ -650,7 +652,9 @@ export function Dashboard({
                       <ChartLine className="mr-3" />
                       {t("dashboard.serverStats")}
                     </p>
-                    <div className="grid gap-4 grid-cols-[repeat(auto-fit,minmax(200px,1fr))] auto-rows-min overflow-y-auto overflow-x-hidden">
+                    <div
+                      className={`grid gap-4 grid-cols-[repeat(auto-fit,minmax(200px,1fr))] auto-rows-min overflow-x-hidden ${serverStatsLoading ? "overflow-y-hidden" : "overflow-y-auto"}`}
+                    >
                       {serverStatsLoading ? (
                         <div className="flex flex-row items-center text-muted-foreground text-sm">
                           <Loader2 className="animate-spin mr-2" size={16} />
diff --git a/src/ui/Desktop/Navigation/TopNavbar.tsx b/src/ui/Desktop/Navigation/TopNavbar.tsx
index 4d9d4e8f..7f98e168 100644
--- a/src/ui/Desktop/Navigation/TopNavbar.tsx
+++ b/src/ui/Desktop/Navigation/TopNavbar.tsx
@@ -486,7 +486,7 @@ export function TopNavbar({
       >
         <div
           ref={containerRef}
-          className="h-full p-1 pr-2 border-r-2 border-dark-border w-[calc(100%-6rem)] flex items-center overflow-x-auto gap-1"
+          className="h-full p-1 pr-2 border-r-2 border-dark-border w-[calc(100%-6rem)] flex items-center overflow-x-auto overflow-y-hidden skinny-scrollbar gap-1"
         >
           {tabs.map((tab: TabData, index: number) => {
             const isActive = tab.id === currentTab;
