diff --git a/ModernKeePass/Strings/en-US/Resources.resw b/ModernKeePass/Strings/en-US/Resources.resw
index 8c4517a..46da78e 100644
--- a/ModernKeePass/Strings/en-US/Resources.resw
+++ b/ModernKeePass/Strings/en-US/Resources.resw
@@ -450,4 +450,10 @@
   <data name="TopMenuSortButton.Content" xml:space="preserve">
     <value>Sort</value>
   </data>
+  <data name="TopMenuSortEntriesFlyout.Text" xml:space="preserve">
+    <value>Sort entries</value>
+  </data>
+  <data name="TopMenuSortGroupsFlyout.Text" xml:space="preserve">
+    <value>Sort groups</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/ModernKeePass/Strings/fr-FR/Resources.resw b/ModernKeePass/Strings/fr-FR/Resources.resw
index 56b6fad..54879be 100644
--- a/ModernKeePass/Strings/fr-FR/Resources.resw
+++ b/ModernKeePass/Strings/fr-FR/Resources.resw
@@ -450,4 +450,10 @@
   <data name="TopMenuSortButton.Content" xml:space="preserve">
     <value>Trier</value>
   </data>
+  <data name="TopMenuSortEntriesFlyout.Text" xml:space="preserve">
+    <value>Trier les entrées</value>
+  </data>
+  <data name="TopMenuSortGroupsFlyout.Text" xml:space="preserve">
+    <value>Trier les groupes</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/ModernKeePass/Views/UserControls/TopMenuUserControl.xaml b/ModernKeePass/Views/UserControls/TopMenuUserControl.xaml
index 495d026..03c1532 100644
--- a/ModernKeePass/Views/UserControls/TopMenuUserControl.xaml
+++ b/ModernKeePass/Views/UserControls/TopMenuUserControl.xaml
@@ -21,13 +21,6 @@
                     </ToolTipService.ToolTip>
                 </SymbolIcon>
             </Button>
-            <ToggleButton Command="{Binding EditCommand, ElementName=UserControl}" IsChecked="{Binding IsEditButtonChecked, ElementName=UserControl, Mode=TwoWay}" Click="EditButton_Click" Style="{StaticResource NoBorderToggleButtonStyle}" Height="50">
-                <SymbolIcon Symbol="Edit">
-                    <ToolTipService.ToolTip>
-                        <ToolTip x:Uid="TopMenuEditButton" />
-                    </ToolTipService.ToolTip>
-                </SymbolIcon>
-            </ToggleButton>
             <Button Visibility="{Binding SortButtonVisibility, ElementName=UserControl}" Style="{StaticResource NoBorderButtonStyle}" Height="50">
                 <SymbolIcon Symbol="Sort">
                     <ToolTipService.ToolTip>
@@ -35,12 +28,19 @@
                     </ToolTipService.ToolTip>
                 </SymbolIcon>
                 <Button.Flyout>
-                    <MenuFlyout>
-                        <MenuFlyoutItem x:Uid="AppBarSortEntries" Command="{Binding SortEntriesCommand, ElementName=UserControl}" />
-                        <MenuFlyoutItem x:Uid="AppBarSortGroups" Command="{Binding SortGroupsCommand, ElementName=UserControl}" />
+                    <MenuFlyout Opening="SortFlyout_OnOpening">
+                        <MenuFlyoutItem x:Uid="AppBarSortEntries" x:Name="SortEntriesButtonFlyout" Command="{Binding SortEntriesCommand, ElementName=UserControl}" />
+                        <MenuFlyoutItem x:Uid="AppBarSortGroups" x:Name="SortGroupsButtonFlyout" Command="{Binding SortGroupsCommand, ElementName=UserControl}" />
                     </MenuFlyout>
                 </Button.Flyout>
             </Button>
+            <ToggleButton Command="{Binding EditCommand, ElementName=UserControl}" IsChecked="{Binding IsEditButtonChecked, ElementName=UserControl, Mode=TwoWay}" Click="EditButton_Click" Style="{StaticResource NoBorderToggleButtonStyle}" Height="50">
+                <SymbolIcon Symbol="Edit">
+                    <ToolTipService.ToolTip>
+                        <ToolTip x:Uid="TopMenuEditButton" />
+                    </ToolTipService.ToolTip>
+                </SymbolIcon>
+            </ToggleButton>
             <Button Command="{Binding DeleteCommand, ElementName=UserControl}" IsEnabled="{Binding IsDeleteButtonEnabled, ElementName=UserControl}" Visibility="{Binding DeleteButtonVisibility, ElementName=UserControl}" Click="DeleteButton_Click" Style="{StaticResource NoBorderButtonStyle}" Height="50">
                 <SymbolIcon Symbol="Delete">
                     <ToolTipService.ToolTip>
@@ -52,13 +52,13 @@
         <Button Visibility="{Binding MoreButtonVisibility, ElementName=UserControl}" Style="{StaticResource NoBorderButtonStyle}" Height="50">
             <SymbolIcon Symbol="More" />
             <Button.Flyout>
-                <MenuFlyout Opening="FlyoutBase_OnOpening">
+                <MenuFlyout Opening="OverflowFlyout_OnOpening">
                     <MenuFlyoutItem x:Uid="TopMenuRestoreFlyout" x:Name="RestoreFlyout" Command="{Binding RestoreCommand, ElementName=UserControl}" IsEnabled="{Binding IsRestoreButtonEnabled,ElementName=UserControl}" Click="RestoreButton_Click" Visibility="{Binding RestoreButtonVisibility, ElementName=UserControl}" />
                     <MenuFlyoutItem x:Uid="TopMenuSaveFlyout" Command="{Binding SaveCommand, ElementName=UserControl}" />
                     <ToggleMenuFlyoutItem x:Uid="TopMenuEditFlyout" x:Name="EditFlyout" Command="{Binding EditCommand, ElementName=UserControl}" IsChecked="{Binding IsEditButtonChecked, ElementName=UserControl, Mode=TwoWay}" Click="EditButton_Click" />
                     <MenuFlyoutItem x:Uid="TopMenuDeleteFlyout" x:Name="DeleteFlyout" Command="{Binding DeleteCommand, ElementName=UserControl}" Click="DeleteButton_Click" Visibility="{Binding DeleteButtonVisibility, ElementName=UserControl}" IsEnabled="{Binding IsDeleteButtonEnabled, ElementName=UserControl}" />
-                    <MenuFlyoutItem x:Uid="AppBarSortEntries" x:Name="SortEntriesFlyout" Command="{Binding SortEntriesCommand, ElementName=UserControl}" Visibility="{Binding SortButtonVisibility, ElementName=UserControl}" />
-                    <MenuFlyoutItem x:Uid="AppBarSortGroups" x:Name="SortGroupsFlyout" Command="{Binding SortGroupsCommand, ElementName=UserControl}" Visibility="{Binding SortButtonVisibility, ElementName=UserControl}" />
+                    <MenuFlyoutItem x:Uid="TopMenuSortEntriesFlyout" x:Name="SortEntriesFlyout" Command="{Binding SortEntriesCommand, ElementName=UserControl}" Visibility="{Binding SortButtonVisibility, ElementName=UserControl}" />
+                    <MenuFlyoutItem x:Uid="TopMenuSortGroupsFlyout" x:Name="SortGroupsFlyout" Command="{Binding SortGroupsCommand, ElementName=UserControl}" Visibility="{Binding SortButtonVisibility, ElementName=UserControl}" />
                 </MenuFlyout>
             </Button.Flyout>
         </Button>
diff --git a/ModernKeePass/Views/UserControls/TopMenuUserControl.xaml.cs b/ModernKeePass/Views/UserControls/TopMenuUserControl.xaml.cs
index 873ecca..d7d5c67 100644
--- a/ModernKeePass/Views/UserControls/TopMenuUserControl.xaml.cs
+++ b/ModernKeePass/Views/UserControls/TopMenuUserControl.xaml.cs
@@ -209,7 +209,7 @@ namespace ModernKeePass.Views.UserControls
             RestoreButtonClick?.Invoke(sender, e);
         }
 
-        private void FlyoutBase_OnOpening(object sender, object e)
+        private void OverflowFlyout_OnOpening(object sender, object e)
         {
             DeleteFlyout.IsEnabled = IsDeleteButtonEnabled;
             DeleteFlyout.Visibility = DeleteButtonVisibility;
@@ -221,6 +221,14 @@ namespace ModernKeePass.Views.UserControls
 
             SortEntriesFlyout.Visibility = SortButtonVisibility;
             SortGroupsFlyout.Visibility = SortButtonVisibility;
+            SortEntriesFlyout.Command = SortEntriesCommand;
+            SortGroupsFlyout.Command = SortGroupsCommand;
+        }
+
+        private void SortFlyout_OnOpening(object sender, object e)
+        {
+            SortEntriesButtonFlyout.Command = SortEntriesCommand;
+            SortGroupsButtonFlyout.Command = SortGroupsCommand;
         }
     }
 }