diff --git a/Wino.Mail/Views/MailRenderingPage.xaml b/Wino.Mail/Views/MailRenderingPage.xaml
index d85f4c2b..95341e93 100644
--- a/Wino.Mail/Views/MailRenderingPage.xaml
+++ b/Wino.Mail/Views/MailRenderingPage.xaml
@@ -150,10 +150,11 @@
             x:Name="RendererBar"
             Grid.Row="0"
             Margin="8,6,0,0"
-            IsSticky="False"
             DefaultLabelPosition="Right"
             HorizontalContentAlignment="Stretch"
-            OverflowButtonVisibility="Auto">
+            OverflowButtonVisibility="Auto"
+            DynamicOverflowItemsChanging="BarDynamicOverflowChanging"
+            IsDynamicOverflowEnabled="True">
             <interactivity:Interaction.Behaviors>
                 <local:BindableCommandBarBehavior
                     ItemClickedCommand="{x:Bind ViewModel.OperationClickedCommand}"
diff --git a/Wino.Mail/Views/MailRenderingPage.xaml.cs b/Wino.Mail/Views/MailRenderingPage.xaml.cs
index eab58fb2..8d16e1d6 100644
--- a/Wino.Mail/Views/MailRenderingPage.xaml.cs
+++ b/Wino.Mail/Views/MailRenderingPage.xaml.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.Messaging;
 using Microsoft.AppCenter.Crashes;
@@ -218,7 +219,7 @@ namespace Wino.Views
 
         private void BarDynamicOverflowChanging(CommandBar sender, DynamicOverflowItemsChangingEventArgs args)
         {
-            if (args.Action == CommandBarDynamicOverflowAction.AddingToOverflow)
+            if (args.Action == CommandBarDynamicOverflowAction.AddingToOverflow || sender.SecondaryCommands.Any())
                 sender.OverflowButtonVisibility = CommandBarOverflowButtonVisibility.Visible;
             else
                 sender.OverflowButtonVisibility = CommandBarOverflowButtonVisibility.Collapsed;