From 47003c8b65a322473ffba3c5b8ea8703bcb4402a Mon Sep 17 00:00:00 2001
From: "Gordon Lam (SH)" <yeelam@microsoft.com>
Date: Sat, 31 Jan 2026 09:29:59 -0800
Subject: [PATCH 1/2] fix(paste): improve keyboard navigation when AI is
 disabled

---
 .../AdvancedPasteXAML/MainWindow.xaml.cs      | 12 ++-
 .../AdvancedPasteXAML/Pages/MainPage.xaml     | 20 +++-
 .../AdvancedPasteXAML/Pages/MainPage.xaml.cs  | 99 +++++++++++++++++++
 3 files changed, 126 insertions(+), 5 deletions(-)

diff --git a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/MainWindow.xaml.cs b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/MainWindow.xaml.cs
index 7d90cf62dce0..bc3325edc401 100644
--- a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/MainWindow.xaml.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/MainWindow.xaml.cs
@@ -125,7 +125,17 @@ private void Hide()
 
         public void SetFocus()
         {
-            MainPage.CustomFormatTextBox.InputTxtBox.Focus(FocusState.Programmatic);
+            // Set initial focus based on AI enabled state:
+            // - If AI is enabled, focus the prompt textbox
+            // - If AI is disabled, focus the paste options list for keyboard navigation
+            if (_optionsViewModel.IsCustomAIServiceEnabled)
+            {
+                MainPage.CustomFormatTextBox.InputTxtBox.Focus(FocusState.Programmatic);
+            }
+            else
+            {
+                MainPage.SetInitialFocusToPasteOptions();
+            }
         }
 
         public void ClearInputText()
diff --git a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Pages/MainPage.xaml b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Pages/MainPage.xaml
index bddfab733da7..294108aafa58 100644
--- a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Pages/MainPage.xaml
+++ b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Pages/MainPage.xaml
@@ -163,11 +163,13 @@
             </Grid.ColumnDefinitions>
             <controls:ClipboardHistoryItemPreviewControl Height="48" ClipboardItem="{x:Bind ViewModel.CurrentClipboardItem, Mode=OneWay}" />
             <Button
+                x:Name="ClipboardHistoryButton"
                 x:Uid="ClipboardHistoryButton"
                 Grid.Column="1"
                 Margin="0,0,4,0"
                 VerticalAlignment="Center"
                 IsEnabled="{x:Bind ViewModel.ClipboardHistoryEnabled, Mode=TwoWay}"
+                KeyDown="ClipboardHistoryButton_KeyDown"
                 Style="{StaticResource SubtleButtonStyle}"
                 Visibility="{x:Bind ViewModel.ShowClipboardHistoryButton, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}">
                 <ToolTipService.ToolTip>
@@ -181,15 +183,19 @@
                     Glyph="&#xE81C;" />
                 <Button.Flyout>
                     <Flyout
+                        x:Name="ClipboardHistoryFlyout"
+                        Closed="ClipboardHistoryFlyout_Closed"
                         FlyoutPresenterStyle="{StaticResource PaddingLessFlyoutPresenterStyle}"
                         Placement="Right"
                         ShouldConstrainToRootBounds="False">
                         <ItemsView
+                            x:Name="ClipboardHistoryItemsView"
                             Width="320"
                             Margin="8,8,8,0"
                             IsItemInvokedEnabled="True"
                             ItemInvoked="ClipboardHistory_ItemInvoked"
                             ItemsSource="{x:Bind clipboardHistory, Mode=OneWay}"
+                            KeyDown="ClipboardHistoryItemsView_KeyDown"
                             SelectionMode="None">
                             <ItemsView.Layout>
                                 <StackLayout Orientation="Vertical" Spacing="8" />
@@ -317,10 +323,13 @@
                     ItemContainerTransitions="{x:Null}"
                     ItemTemplateSelector="{StaticResource PasteFormatTemplateSelector}"
                     ItemsSource="{x:Bind ViewModel.StandardPasteFormats, Mode=OneWay}"
+                    KeyDown="PasteOptionsListView_KeyDown"
                     ScrollViewer.VerticalScrollBarVisibility="Disabled"
                     ScrollViewer.VerticalScrollMode="Disabled"
-                    SelectionMode="None"
-                    TabIndex="1" />
+                    SelectionMode="Single"
+                    SingleSelectionFollowsFocus="True"
+                    TabIndex="1"
+                    XYFocusKeyboardNavigation="Enabled" />
                 <Rectangle
                     Grid.Row="1"
                     Height="1"
@@ -337,10 +346,13 @@
                     ItemContainerTransitions="{x:Null}"
                     ItemTemplateSelector="{StaticResource PasteFormatTemplateSelector}"
                     ItemsSource="{x:Bind ViewModel.CustomActionPasteFormats, Mode=OneWay}"
+                    KeyDown="PasteOptionsListView_KeyDown"
                     ScrollViewer.VerticalScrollBarVisibility="Disabled"
                     ScrollViewer.VerticalScrollMode="Disabled"
-                    SelectionMode="None"
-                    TabIndex="2" />
+                    SelectionMode="Single"
+                    SingleSelectionFollowsFocus="True"
+                    TabIndex="2"
+                    XYFocusKeyboardNavigation="Enabled" />
             </Grid>
         </ScrollViewer>
     </Grid>
diff --git a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Pages/MainPage.xaml.cs b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Pages/MainPage.xaml.cs
index 5bef6389f0dd..9583ab5bc2c3 100644
--- a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Pages/MainPage.xaml.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Pages/MainPage.xaml.cs
@@ -15,6 +15,7 @@
 using Microsoft.PowerToys.Telemetry;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
 using Microsoft.UI.Xaml.Media.Imaging;
 using Windows.ApplicationModel.DataTransfer;
 using Windows.Storage.Streams;
@@ -208,5 +209,103 @@ private void ClipboardHistory_ItemInvoked(ItemsView sender, ItemsViewItemInvoked
                 Clipboard.SetHistoryItemAsContent(item.Item);
             }
         }
+
+        /// <summary>
+        /// Sets initial focus to the paste options list when AI is disabled.
+        /// </summary>
+        public void SetInitialFocusToPasteOptions()
+        {
+            try
+            {
+                if (PasteOptionsListView.Items.Count > 0)
+                {
+                    PasteOptionsListView.SelectedIndex = 0;
+                    PasteOptionsListView.Focus(FocusState.Programmatic);
+                    Logger.LogTrace("Focus set to PasteOptionsListView");
+                }
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError("Failed to set focus to paste options", ex);
+            }
+        }
+
+        /// <summary>
+        /// Gets the appropriate arrow key for "forward" direction based on RTL settings.
+        /// </summary>
+        private VirtualKey GetForwardKey()
+        {
+            return FlowDirection == FlowDirection.RightToLeft ? VirtualKey.Left : VirtualKey.Right;
+        }
+
+        /// <summary>
+        /// Gets the appropriate arrow key for "backward" direction based on RTL settings.
+        /// </summary>
+        private VirtualKey GetBackwardKey()
+        {
+            return FlowDirection == FlowDirection.RightToLeft ? VirtualKey.Right : VirtualKey.Left;
+        }
+
+        /// <summary>
+        /// Handles keyboard navigation on the paste options ListViews.
+        /// Enter key invokes the selected item.
+        /// </summary>
+        private async void PasteOptionsListView_KeyDown(object sender, Microsoft.UI.Xaml.Input.KeyRoutedEventArgs e)
+        {
+            if (sender is ListView listView && e.Key == VirtualKey.Enter)
+            {
+                if (listView.SelectedItem is PasteFormat format)
+                {
+                    e.Handled = true;
+                    await ViewModel.ExecutePasteFormatAsync(format, PasteActionSource.ContextMenu);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Handles keyboard navigation on the clipboard history button.
+        /// Right arrow (or Left in RTL) opens the flyout.
+        /// </summary>
+        private void ClipboardHistoryButton_KeyDown(object sender, Microsoft.UI.Xaml.Input.KeyRoutedEventArgs e)
+        {
+            if (e.Key == GetForwardKey())
+            {
+                e.Handled = true;
+                if (ClipboardHistoryButton.Flyout is Flyout flyout)
+                {
+                    flyout.ShowAt(ClipboardHistoryButton);
+                    Logger.LogTrace("Clipboard history flyout opened via keyboard");
+                }
+            }
+        }
+
+        /// <summary>
+        /// Handles keyboard navigation within the clipboard history flyout.
+        /// Escape or Left arrow (Right in RTL) closes the flyout and returns focus to the button.
+        /// </summary>
+        private void ClipboardHistoryItemsView_KeyDown(object sender, Microsoft.UI.Xaml.Input.KeyRoutedEventArgs e)
+        {
+            if (e.Key == VirtualKey.Escape || e.Key == GetBackwardKey())
+            {
+                e.Handled = true;
+                ClipboardHistoryFlyout.Hide();
+            }
+        }
+
+        /// <summary>
+        /// Handles the clipboard history flyout closing event.
+        /// Returns focus to the clipboard history button.
+        /// </summary>
+        private void ClipboardHistoryFlyout_Closed(object sender, object e)
+        {
+            try
+            {
+                ClipboardHistoryButton.Focus(FocusState.Programmatic);
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError("Failed to return focus to clipboard history button", ex);
+            }
+        }
     }
 }

From 38cd09708aa0da8c73e5f7869977328026f2d97b Mon Sep 17 00:00:00 2001
From: "Gordon Lam (SH)" <yeelam@microsoft.com>
Date: Sat, 31 Jan 2026 09:38:42 -0800
Subject: [PATCH 2/2] fix(paste): correct telemetry source and remove unused
 import

- Changed PasteActionSource.ContextMenu to PasteActionSource.InAppKeyboardShortcut for
  Enter key invocation in PasteOptionsListView_KeyDown
- Removed unused Microsoft.UI.Xaml.Controls.Primitives import
---
 .../AdvancedPaste/AdvancedPasteXAML/Pages/MainPage.xaml.cs     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Pages/MainPage.xaml.cs b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Pages/MainPage.xaml.cs
index 9583ab5bc2c3..89aa912b981b 100644
--- a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Pages/MainPage.xaml.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Pages/MainPage.xaml.cs
@@ -15,7 +15,6 @@
 using Microsoft.PowerToys.Telemetry;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
 using Microsoft.UI.Xaml.Media.Imaging;
 using Windows.ApplicationModel.DataTransfer;
 using Windows.Storage.Streams;
@@ -257,7 +256,7 @@ private async void PasteOptionsListView_KeyDown(object sender, Microsoft.UI.Xaml
                 if (listView.SelectedItem is PasteFormat format)
                 {
                     e.Handled = true;
-                    await ViewModel.ExecutePasteFormatAsync(format, PasteActionSource.ContextMenu);
+                    await ViewModel.ExecutePasteFormatAsync(format, PasteActionSource.InAppKeyboardShortcut);
                 }
             }
         }