diff --git a/src/Views/Launcher.axaml b/src/Views/Launcher.axaml
index f5166de2..9166f095 100644
--- a/src/Views/Launcher.axaml
+++ b/src/Views/Launcher.axaml
@@ -96,7 +96,8 @@
                       VerticalScrollBarVisibility="Disabled"
                       DoubleTapped="MaximizeOrRestoreWindow"
                       PointerPressed="BeginMoveWindow"
-                      PointerWheelChanged="ScrollTabs">
+                      PointerWheelChanged="ScrollTabs"
+                      ScrollChanged="OnTabsScrollChanged">
           <StackPanel x:Name="launcherTabsBar" Orientation="Horizontal" SizeChanged="UpdateScrollIndicator">
             <ListBox Classes="launcher_page_tabbar"
                      ItemsSource="{Binding Pages}"
diff --git a/src/Views/Launcher.axaml.cs b/src/Views/Launcher.axaml.cs
index 8d5a38b8..17a5e78a 100644
--- a/src/Views/Launcher.axaml.cs
+++ b/src/Views/Launcher.axaml.cs
@@ -265,6 +265,15 @@ namespace SourceGit.Views
             e.Handled = true;
         }
 
+        private void OnTabsScrollChanged(object sender, ScrollChangedEventArgs e)
+        {
+            if (sender is ScrollViewer scrollViewer)
+            {
+                leftScrollIndicator.IsEnabled = scrollViewer.Offset.X > 0;
+                rightScrollIndicator.IsEnabled = scrollViewer.Offset.X < scrollViewer.Extent.Width - scrollViewer.Viewport.Width;
+            }
+        }
+
         private void SetupDragAndDrop(object sender, RoutedEventArgs e)
         {
             if (sender is Border border)