diff --git a/SourceGit/Resources/Icons.xaml b/SourceGit/Resources/Icons.xaml
index ae8f687b..66103f5a 100644
--- a/SourceGit/Resources/Icons.xaml
+++ b/SourceGit/Resources/Icons.xaml
@@ -2,7 +2,10 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Geometry x:Key="Icon.Git">M1004.824 466.4L557.72 19.328c-25.728-25.76-67.488-25.76-93.28 0L360.568 123.2l78.176 78.176c12.544-5.984 26.56-9.376 41.376-9.376 53.024 0 96 42.976 96 96 0 14.816-3.36 28.864-9.376 41.376l127.968 127.968c12.544-5.984 26.56-9.376 41.376-9.376 53.024 0 96 42.976 96 96s-42.976 96-96 96-96-42.976-96-96c0-14.816 3.36-28.864 9.376-41.376L521.496 374.624a88.837 88.837 0 0 1-9.376 3.872v266.976c37.28 13.184 64 48.704 64 90.528 0 53.024-42.976 96-96 96s-96-42.976-96-96c0-41.792 26.72-77.344 64-90.528V378.496c-37.28-13.184-64-48.704-64-90.528 0-14.816 3.36-28.864 9.376-41.376l-78.176-78.176L19.416 464.288c-25.76 25.792-25.76 67.52 0 93.28l447.136 447.072c25.728 25.76 67.488 25.76 93.28 0l444.992-444.992c25.76-25.76 25.76-67.552 0-93.28z</Geometry>
     <Geometry x:Key="Icon.Submodule">M557.696 545.347L789.873 402.66c23.998-14.999 31.297-46.496 16.398-70.493-14.798-23.798-45.995-31.197-69.993-16.699L506.501 456.555 277.123 315.37c-24.098-14.798-55.595-7.3-70.493 16.799-14.799 24.097-7.3 55.594 16.798 70.493l231.778 142.586V819.12c0 28.297 22.897 51.195 51.195 51.195 28.297 0 51.195-22.898 51.195-51.195V545.347h0.1zM506.5 0l443.356 255.975v511.95L506.501 1023.9 63.144 767.925v-511.95L506.5 0z</Geometry>
-    
+
+    <Geometry x:Key="Icon.ScrollLeft">M753.613 996.727L269.38 511.505 754.602 27.272z</Geometry>
+    <Geometry x:Key="Icon.ScrollRight">M270.387 27.273L754.62 512.495 269.398 996.728z</Geometry>
+
     <Geometry x:Key="Icon.Minimize">F1M0,6L0,9 9,9 9,6 0,6z</Geometry>
     <Geometry x:Key="Icon.Maximize">F1M0,0L0,9 9,9 9,0 0,0 0,3 8,3 8,8 1,8 1,3z</Geometry>
     <Geometry x:Key="Icon.Restore">F1M0,10L0,3 3,3 3,0 10,0 10,2 4,2 4,3 7,3 7,6 6,6 6,5 1,5 1,10z M1,10L7,10 7,7 10,7 10,2 9,2 9,6 6,6 6,9 1,9z</Geometry>
diff --git a/SourceGit/SourceGit.csproj b/SourceGit/SourceGit.csproj
index dbb64ca1..896fbe8e 100644
--- a/SourceGit/SourceGit.csproj
+++ b/SourceGit/SourceGit.csproj
@@ -9,7 +9,7 @@
         <Description>OpenSource GIT client for Windows</Description>
         <Copyright>Copyright © sourcegit 2020. All rights reserved.</Copyright>
         <ApplicationManifest>App.manifest</ApplicationManifest>
-        <Version>1.4</Version>
+        <Version>1.5</Version>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
diff --git a/SourceGit/UI/Launcher.xaml b/SourceGit/UI/Launcher.xaml
index 3f6b3eaa..549f4ec7 100644
--- a/SourceGit/UI/Launcher.xaml
+++ b/SourceGit/UI/Launcher.xaml
@@ -43,132 +43,140 @@
 
             <Grid Grid.Row="0">
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*"/>
+                    <ColumnDefinition x:Name="openedTabsColumn" Width="*"/>
+                    <ColumnDefinition Width="32"/>
                     <ColumnDefinition Width="Auto"/>
                 </Grid.ColumnDefinitions>
 
                 <!-- Tabs -->
-                <TabControl
-                    x:Name="openedTabs"
-                    Grid.Column="0"
-                    Padding="0"
-                    ItemsSource="{Binding ElementName=me, Path=Tabs}">
-                    <TabControl.Style>
-                        <Style TargetType="{x:Type TabControl}">
-                            <Setter Property="Template">
-                                <Setter.Value>
-                                    <ControlTemplate TargetType="{x:Type TabControl}">
-                                        <Grid KeyboardNavigation.TabNavigation="Local" Height="32">
-                                            <StackPanel Orientation="Horizontal"
-                                                x:Name="HeaderPanel" 
-                                                Grid.Row="0" 
-                                                Margin="6,4,0,0" 
-                                                IsItemsHost="True" 
-                                                KeyboardNavigation.TabIndex="1" 
-                                                Background="Transparent" />
-                                        </Grid>
-                                    </ControlTemplate>
-                                </Setter.Value>
-                            </Setter>
-                        </Style>
-                    </TabControl.Style>
+                <ScrollViewer x:Name="openedTabsScroller" Grid.Column="0" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Disabled">
+                    <TabControl x:Name="openedTabs" Padding="0" ItemsSource="{Binding ElementName=me, Path=Tabs}" SizeChanged="OpenedTabsSizeChanged">
+                        <TabControl.Style>
+                            <Style TargetType="{x:Type TabControl}">
+                                <Setter Property="Template">
+                                    <Setter.Value>
+                                        <ControlTemplate TargetType="{x:Type TabControl}">
+                                            <Grid KeyboardNavigation.TabNavigation="Local" Height="32">
+                                                <StackPanel Orientation="Horizontal"
+                                                    x:Name="HeaderPanel" 
+                                                    Grid.Row="0" 
+                                                    Margin="6,4,0,0" 
+                                                    IsItemsHost="True" 
+                                                    KeyboardNavigation.TabIndex="1" 
+                                                    Background="Transparent" />
+                                            </Grid>
+                                        </ControlTemplate>
+                                    </Setter.Value>
+                                </Setter>
+                            </Style>
+                        </TabControl.Style>
 
-                    <TabControl.ItemContainerStyle>
-                        <Style TargetType="{x:Type TabItem}">
-                            <Setter Property="AllowDrop" Value="True"/>
-                            <Setter Property="IsSelected" Value="{Binding IsActive, Mode=TwoWay}"/>
-                            <Setter Property="Template">
-                                <Setter.Value>
-                                    <ControlTemplate TargetType="{x:Type TabItem}">
-                                        <Grid x:Name="Container" Opacity=".7" Height="28" WindowChrome.IsHitTestVisibleInChrome="True">
-                                            <Border x:Name="BG" Background="Transparent" BorderThickness="0" BorderBrush="{StaticResource Brush.BG3}" CornerRadius="4,4,0,0">
-                                                <Border.Effect>
-                                                    <DropShadowEffect ShadowDepth="2" Direction="90" Color="Black" Opacity=".3"/>
-                                                </Border.Effect>
-                                            </Border>
+                        <TabControl.ItemContainerStyle>
+                            <Style TargetType="{x:Type TabItem}">
+                                <Setter Property="AllowDrop" Value="True"/>
+                                <Setter Property="IsSelected" Value="{Binding IsActive, Mode=TwoWay}"/>
+                                <Setter Property="Template">
+                                    <Setter.Value>
+                                        <ControlTemplate TargetType="{x:Type TabItem}">
+                                            <Grid x:Name="Container" Opacity=".7" Height="28" WindowChrome.IsHitTestVisibleInChrome="True">
+                                                <Border x:Name="BG" Background="Transparent" BorderThickness="0" BorderBrush="{StaticResource Brush.BG3}" CornerRadius="4,4,0,0">
+                                                    <Border.Effect>
+                                                        <DropShadowEffect ShadowDepth="2" Direction="90" Color="Black" Opacity=".3"/>
+                                                    </Border.Effect>
+                                                </Border>
 
-                                            <Path
-                                                x:Name="CornerLeft"
-                                                Width="4"
-                                                Height="4"
-                                                HorizontalAlignment="Left"
-                                                VerticalAlignment="Bottom"
-                                                Margin="-4,0,0,0"
-                                                Data="M 0,4 L 4,4 4,0 C 4,0 4,4 0,4 Z"
-                                                Fill="Transparent"/>
+                                                <Path
+                                                    x:Name="CornerLeft"
+                                                    Width="4"
+                                                    Height="4"
+                                                    HorizontalAlignment="Left"
+                                                    VerticalAlignment="Bottom"
+                                                    Margin="-4,0,0,0"
+                                                    Data="M 0,4 L 4,4 4,0 C 4,0 4,4 0,4 Z"
+                                                    Fill="Transparent"/>
 
-                                            <Path
-                                                x:Name="CornerRight"
-                                                Width="4"
-                                                Height="4"
-                                                HorizontalAlignment="Right"
-                                                VerticalAlignment="Bottom"
-                                                Margin="0,0,-4,0"
-                                                Data="M 0,0 L 0,4 4,4 C 4,4 0,4 0,0 Z"
-                                                Fill="Transparent"/>
+                                                <Path
+                                                    x:Name="CornerRight"
+                                                    Width="4"
+                                                    Height="4"
+                                                    HorizontalAlignment="Right"
+                                                    VerticalAlignment="Bottom"
+                                                    Margin="0,0,-4,0"
+                                                    Data="M 0,0 L 0,4 4,4 C 4,4 0,4 0,0 Z"
+                                                    Fill="Transparent"/>
 
-                                            <ContentPresenter 
-                                                x:Name="ContentSite" 
-                                                VerticalAlignment="Center" HorizontalAlignment="Center" 
-                                                TextElement.Foreground="{DynamicResource Brush.FG}"
-                                                TextElement.FontWeight="Bold"
-                                                ContentSource="Header"
-                                                Margin="4,0"
-                                                RecognizesAccessKey="True" />
-                                        </Grid>
-                                        <ControlTemplate.Triggers>
-                                            <Trigger Property="IsSelected" Value="True">
-                                                <Setter TargetName="BG" Property="Background" Value="{DynamicResource Brush.BG1}"/>
-                                                <Setter TargetName="BG" Property="BorderThickness" Value="1,1,1,0"/>
-                                                <Setter TargetName="Container" Property="Opacity" Value="1"/>
-                                                <Setter TargetName="CornerLeft" Property="Fill" Value="{StaticResource Brush.BG1}"/>
-                                                <Setter TargetName="CornerRight" Property="Fill" Value="{StaticResource Brush.BG1}"/>
-                                            </Trigger>
-                                            <MultiTrigger>
-                                                <MultiTrigger.Conditions>
-                                                    <Condition Property="IsSelected" Value="False"/>
-                                                    <Condition Property="IsMouseOver" Value="True"/>
-                                                </MultiTrigger.Conditions>
-                                                <Setter TargetName="BG" Property="Background" Value="{DynamicResource Brush.BG5}"/>
-                                            </MultiTrigger>
-                                        </ControlTemplate.Triggers>
-                                    </ControlTemplate>
-                                </Setter.Value>
-                            </Setter>
+                                                <ContentPresenter 
+                                                    x:Name="ContentSite" 
+                                                    VerticalAlignment="Center" HorizontalAlignment="Center" 
+                                                    TextElement.Foreground="{DynamicResource Brush.FG}"
+                                                    TextElement.FontWeight="Bold"
+                                                    ContentSource="Header"
+                                                    Margin="4,0"
+                                                    RecognizesAccessKey="True" />
+                                            </Grid>
+                                            <ControlTemplate.Triggers>
+                                                <Trigger Property="IsSelected" Value="True">
+                                                    <Setter TargetName="BG" Property="Background" Value="{DynamicResource Brush.BG1}"/>
+                                                    <Setter TargetName="BG" Property="BorderThickness" Value="1,1,1,0"/>
+                                                    <Setter TargetName="Container" Property="Opacity" Value="1"/>
+                                                    <Setter TargetName="CornerLeft" Property="Fill" Value="{StaticResource Brush.BG1}"/>
+                                                    <Setter TargetName="CornerRight" Property="Fill" Value="{StaticResource Brush.BG1}"/>
+                                                </Trigger>
+                                                <MultiTrigger>
+                                                    <MultiTrigger.Conditions>
+                                                        <Condition Property="IsSelected" Value="False"/>
+                                                        <Condition Property="IsMouseOver" Value="True"/>
+                                                    </MultiTrigger.Conditions>
+                                                    <Setter TargetName="BG" Property="Background" Value="{DynamicResource Brush.BG5}"/>
+                                                </MultiTrigger>
+                                            </ControlTemplate.Triggers>
+                                        </ControlTemplate>
+                                    </Setter.Value>
+                                </Setter>
 
-                            <EventSetter Event="MouseMove" Handler="TabsMouseMove"/>
-                            <EventSetter Event="Drop" Handler="TabsDrop"/>
-                        </Style>
-                    </TabControl.ItemContainerStyle>
+                                <EventSetter Event="MouseMove" Handler="TabsMouseMove"/>
+                                <EventSetter Event="Drop" Handler="TabsDrop"/>
+                            </Style>
+                        </TabControl.ItemContainerStyle>
 
-                    <TabControl.ItemTemplate>
-                        <DataTemplate>
-                            <StackPanel Orientation="Horizontal" Margin="6,0">
-                                <Path Grid.Column="0" Width="14" Height="14" x:Name="Icon" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Git}"/>
-                                <TextBlock Grid.Column="1" Text="{Binding Title}" Foreground="{StaticResource Brush.FG}" Margin="8,0,0,0"/>
-                                <Button x:Name="Closer" Margin="8,0,0,0" Grid.Column="2" Click="CloseRepo" ToolTip="CLOSE">
-                                    <Path Width="8" Height="8" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Close}"/>
-                                </Button>
-                            </StackPanel>
+                        <TabControl.ItemTemplate>
+                            <DataTemplate>
+                                <StackPanel Orientation="Horizontal" Margin="6,0">
+                                    <Path Grid.Column="0" Width="14" Height="14" x:Name="Icon" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Git}"/>
+                                    <TextBlock Grid.Column="1" Text="{Binding Title}" Foreground="{StaticResource Brush.FG}" Margin="8,0,0,0"/>
+                                    <Button x:Name="Closer" Margin="8,0,0,0" Grid.Column="2" Click="CloseRepo" ToolTip="CLOSE">
+                                        <Path Width="8" Height="8" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Close}"/>
+                                    </Button>
+                                </StackPanel>
 
-                            <DataTemplate.Triggers>
-                                <DataTrigger Binding="{Binding Repo}" Value="{x:Null}">
-                                    <Setter TargetName="Icon" Property="Data" Value="{StaticResource Icon.Git}"/>
-                                    <Setter TargetName="Icon" Property="Fill" Value="#FFF05133"/>
-                                    <Setter TargetName="Closer" Property="Visibility" Value="Collapsed"/>
-                                </DataTrigger>
-                            </DataTemplate.Triggers>
-                        </DataTemplate>
-                    </TabControl.ItemTemplate>
-                </TabControl>
+                                <DataTemplate.Triggers>
+                                    <DataTrigger Binding="{Binding Repo}" Value="{x:Null}">
+                                        <Setter TargetName="Icon" Property="Data" Value="{StaticResource Icon.Git}"/>
+                                        <Setter TargetName="Icon" Property="Fill" Value="#FFF05133"/>
+                                        <Setter TargetName="Closer" Property="Visibility" Value="Collapsed"/>
+                                    </DataTrigger>
+                                </DataTemplate.Triggers>
+                            </DataTemplate>
+                        </TabControl.ItemTemplate>
+                    </TabControl>
+                </ScrollViewer>
+                
+                <!-- Tab scroller -->
+                <StackPanel x:Name="openedTabsOpts" Grid.Column="1" VerticalAlignment="Bottom" Orientation="Horizontal" Height="28" Margin="4,0,0,0" WindowChrome.IsHitTestVisibleInChrome="True">
+                    <Button Click="ScrollToLeft">
+                        <Path Width="10" Height="12" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.ScrollLeft}"/>
+                    </Button>
+                    <Button Click="ScrollToRight">
+                        <Path Width="10" Height="12" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.ScrollRight}"/>
+                    </Button>
+                </StackPanel>
 
                 <!-- Window Command -->
                 <StackPanel
-                    Grid.Column="1"
+                    Grid.Column="2"
                     Margin="32,0,0,0"
                     Orientation="Horizontal"
                     HorizontalAlignment="Right"
-                    VerticalAlignment="Top"
                     Height="32"
                     WindowChrome.IsHitTestVisibleInChrome="True">
                     <Button Click="ShowPreference" Width="24" ToolTip="PREFERENCE">
diff --git a/SourceGit/UI/Launcher.xaml.cs b/SourceGit/UI/Launcher.xaml.cs
index bd069bca..1d9146cb 100644
--- a/SourceGit/UI/Launcher.xaml.cs
+++ b/SourceGit/UI/Launcher.xaml.cs
@@ -191,5 +191,23 @@ namespace SourceGit.UI {
             }
         }
         #endregion
+
+        #region TAB_SCROLL
+        private void OpenedTabsSizeChanged(object sender, SizeChangedEventArgs e) {
+            if (openedTabs.ActualWidth > openedTabsColumn.ActualWidth) {
+                openedTabsOpts.Visibility = Visibility.Visible;
+            } else {
+                openedTabsOpts.Visibility = Visibility.Collapsed;
+            }
+        }
+
+        private void ScrollToLeft(object sender, RoutedEventArgs e) {
+            openedTabsScroller.LineLeft();
+        }
+
+        private void ScrollToRight(object sender, RoutedEventArgs e) {
+            openedTabsScroller.LineRight();
+        }
+        #endregion
     }
 }