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 @@