diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/CommandBar.xaml b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/CommandBar.xaml
index aba9ed477d..78e234a184 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/CommandBar.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/CommandBar.xaml
@@ -173,9 +173,13 @@
                 Visibility="{x:Bind ViewModel.HasPrimaryCommand, Mode=OneWay}">
                 <StackPanel Orientation="Horizontal" Spacing="8">
                     <TextBlock
+                        MaxWidth="160"
                         VerticalAlignment="Center"
+                        MaxLines="1"
                         Style="{StaticResource CaptionTextBlockStyle}"
-                        Text="{x:Bind ViewModel.PrimaryCommand.Name, Mode=OneWay}" />
+                        Text="{x:Bind ViewModel.PrimaryCommand.Name, Mode=OneWay}"
+                        TextTrimming="CharacterEllipsis"
+                        TextWrapping="NoWrap" />
                     <Border Style="{StaticResource HotkeyStyle}">
                         <FontIcon Glyph="&#xE751;" Style="{StaticResource HotkeyFontIconStyle}" />
                     </Border>
@@ -192,9 +196,13 @@
                 Visibility="{x:Bind ViewModel.HasSecondaryCommand, Mode=OneWay}">
                 <StackPanel Orientation="Horizontal" Spacing="8">
                     <TextBlock
+                        MaxWidth="160"
                         VerticalAlignment="Center"
+                        MaxLines="1"
                         Style="{StaticResource CaptionTextBlockStyle}"
-                        Text="{x:Bind ViewModel.SecondaryCommand.Name, Mode=OneWay}" />
+                        Text="{x:Bind ViewModel.SecondaryCommand.Name, Mode=OneWay}"
+                        TextTrimming="CharacterEllipsis"
+                        TextWrapping="NoWrap" />
                     <StackPanel Orientation="Horizontal" Spacing="4">
                         <Border Padding="4,2,4,2" Style="{StaticResource HotkeyStyle}">
                             <TextBlock Style="{StaticResource HotkeyTextBlockStyle}" Text="Ctrl" />
@@ -218,7 +226,9 @@
                     <TextBlock
                         VerticalAlignment="Center"
                         Style="{StaticResource CaptionTextBlockStyle}"
-                        Text="More" />
+                        Text="More"
+                        TextTrimming="WordEllipsis"
+                        TextWrapping="NoWrap" />
                     <StackPanel Orientation="Horizontal" Spacing="4">
                         <Border Padding="4,2,4,2" Style="{StaticResource HotkeyStyle}">
                             <TextBlock Style="{StaticResource HotkeyTextBlockStyle}" Text="Ctrl" />
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ContextMenu.xaml b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ContextMenu.xaml
index 5636de9aca..a64c6eae01 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ContextMenu.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ContextMenu.xaml
@@ -50,6 +50,7 @@
                         MaxWidth="200"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
+                        MaxLines="1"
                         Text="{x:Bind Title}"
                         TextTrimming="WordEllipsis"
                         TextWrapping="NoWrap">
@@ -90,6 +91,7 @@
                         MaxWidth="200"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
+                        MaxLines="1"
                         Style="{StaticResource ContextItemTitleTextBlockCriticalStyle}"
                         Text="{x:Bind Title}"
                         TextTrimming="WordEllipsis"
diff --git a/src/modules/cmdpal/ext/SamplePagesExtension/EvilSamplesPage.cs b/src/modules/cmdpal/ext/SamplePagesExtension/EvilSamplesPage.cs
index 80a584208a..1fc86bb54a 100644
--- a/src/modules/cmdpal/ext/SamplePagesExtension/EvilSamplesPage.cs
+++ b/src/modules/cmdpal/ext/SamplePagesExtension/EvilSamplesPage.cs
@@ -219,12 +219,18 @@ public partial class EvilSamplesPage : ListPage
                 }
             ],
         },
+        new ListItem(
+            new ToastCommand("Primary command invoked", MessageState.Info) { Name = "H W\r\nE O\r\nL R\r\nL L\r\nO D", Icon = new IconInfo("\uF146") })
+        {
+            Title = "noop third command test",
+            Icon = new IconInfo("\uE712"),  // "More" dots
+        },
         new ListItem(new EvilDuplicateRequestedShortcut())
         {
             Title = "Evil keyboard shortcuts",
             Subtitle = "Two commands with the same shortcut and more...",
             Icon = new IconInfo("\uE765"),
-        }
+        },
     ];
 
     public EvilSamplesPage()