diff --git a/src/FluentHub.App/UserControls/GitCloneFlyout.xaml b/src/FluentHub.App/UserControls/GitCloneFlyout.xaml
index 3ff34f417..eda0d40a0 100644
--- a/src/FluentHub.App/UserControls/GitCloneFlyout.xaml
+++ b/src/FluentHub.App/UserControls/GitCloneFlyout.xaml
@@ -124,44 +124,17 @@
 					</StackPanel>
 				</Button>
 
-				<Button
-					MinHeight="20"
-					Padding="4,2"
-					HorizontalAlignment="Stretch"
-					Background="Transparent"
-					Click="OpenVSButton_Click"
-					FontSize="14"
-					IsEnabled="True">
-					<StackPanel Orientation="Horizontal" Spacing="8">
-						<TextBlock Text="Open with Visual Studio" />
-					</StackPanel>
-				</Button>
-
-				<Button
-					MinHeight="20"
-					Padding="4,2"
-					HorizontalAlignment="Stretch"
-					Background="Transparent"
-					Click="OpenVSCodeButton_Click"
-					FontSize="14"
-					IsEnabled="True">
-					<StackPanel Orientation="Horizontal" Spacing="8">
-						<TextBlock Text="Edit with Visual Studio Code" />
-					</StackPanel>
-				</Button>
-
-				<Button
-					HorizontalAlignment="Stretch"
-					Click="OpenCodespaceButton_Click"
-					IsEnabled="True">
-					<StackPanel Orientation="Horizontal" Spacing="8">
-						<FontIcon
-							FontFamily="{StaticResource Octicons}"
-							FontSize="14"
-							Glyph="&#xE954;" />
-						<TextBlock Text="Open in Codespaces" />
-					</StackPanel>
-				</Button>
+				<SplitButton x:Name="OpenWithButton" HorizontalAlignment="Stretch">
+					<TextBlock Text="Open with..." />
+					<SplitButton.Flyout>
+						<MenuFlyout Placement="BottomEdgeAlignedRight">
+							<MenuFlyoutItem Click="OpenVSCodeButton_Click" Text="Visual Studio Code" />
+							<MenuFlyoutItem Click="OpenVSButton_Click" Text="Visual Studio" />
+							<MenuFlyoutSeparator />
+							<MenuFlyoutItem Click="OpenCodespaceButton_Click" Text="GitHub Codespaces" />
+						</MenuFlyout>
+					</SplitButton.Flyout>
+				</SplitButton>
 
 				<Button
 					HorizontalAlignment="Stretch"