diff --git a/src/Files.App/UserControls/StatusBarControl.xaml b/src/Files.App/UserControls/StatusBarControl.xaml
index d496f878780cd..96193846ec348 100644
--- a/src/Files.App/UserControls/StatusBarControl.xaml
+++ b/src/Files.App/UserControls/StatusBarControl.xaml
@@ -61,11 +61,13 @@
 				BorderThickness="0"
 				Content="{x:Bind DirectoryPropertiesViewModel.GitBranchDisplayName, Mode=OneWay}">
 				<Button.Flyout>
-					<Flyout x:Name="GitBranchesFlyout" Opening="Flyout_Opening">
+					<Flyout Opening="Flyout_Opening">
 						<Grid
+							x:Name="BranchesGrid"
 							Width="300"
 							Height="340"
-							Margin="-16">
+							Margin="-16"
+							LostFocus="BranchesGrid_LostFocus">
 							<Grid.RowDefinitions>
 								<RowDefinition Height="Auto" />
 								<RowDefinition Height="*" />
@@ -98,11 +100,9 @@
 
 							<!--  Branches List  -->
 							<ListView
-								x:Name="BranchesListView"
 								Grid.Row="1"
 								Padding="4"
 								Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
-								ItemClick="BranchesListView_ItemClick"
 								ItemsSource="{x:Bind DirectoryPropertiesViewModel.BranchesNames, Mode=OneWay}"
 								SelectedIndex="{x:Bind DirectoryPropertiesViewModel.SelectedBranchIndex, Mode=TwoWay}"
 								SelectionMode="Single" />
diff --git a/src/Files.App/UserControls/StatusBarControl.xaml.cs b/src/Files.App/UserControls/StatusBarControl.xaml.cs
index 472fe82ea2e5f..7b668bb79274e 100644
--- a/src/Files.App/UserControls/StatusBarControl.xaml.cs
+++ b/src/Files.App/UserControls/StatusBarControl.xaml.cs
@@ -49,9 +49,9 @@ private void Flyout_Opening(object sender, object e)
 			DirectoryPropertiesViewModel.SelectedBranchIndex = DirectoryPropertiesViewModel.ActiveBranchIndex;
 		}
 
-		private void BranchesListView_ItemClick(object sender, ItemClickEventArgs e)
+		private void BranchesGrid_LostFocus(object sender, RoutedEventArgs e)
 		{
-			GitBranchesFlyout.Hide();
+			((Popup)((FlyoutPresenter)((Grid)sender).Parent).Parent).IsOpen = false;
 		}
 	}
 }