diff --git a/src/EditorFeatures/Core/InlineRename/UI/Adornment/RenameFlyout.xaml b/src/EditorFeatures/Core/InlineRename/UI/Adornment/RenameFlyout.xaml
index 36632cbe37f86..0be8609cb7181 100644
--- a/src/EditorFeatures/Core/InlineRename/UI/Adornment/RenameFlyout.xaml
+++ b/src/EditorFeatures/Core/InlineRename/UI/Adornment/RenameFlyout.xaml
@@ -15,12 +15,12 @@
              KeyDown="Adornment_KeyDown"
              MouseDown="Adornment_ConsumeMouseEvent"
              MouseUp="Adornment_ConsumeMouseEvent"
-             GotKeyboardFocus="Adornment_GotKeyboardFocus"
-             Focusable="False"
+             Focusable="True"
              UseLayoutRounding="True"
              Cursor="Arrow"
              Visibility="{Binding Path=Visibility}"
-             x:Name="control">
+             x:Name="control"
+             KeyboardNavigation.TabNavigation="Cycle">
 
     <UserControl.Resources>
         <ResourceDictionary>
@@ -45,7 +45,8 @@
                 <rename:RenameUserInputPresenter
                     Grid.Column="0"
                     x:Name="RenameUserInputPresenter"
-                    HorizontalAlignment="Stretch"/>
+                    HorizontalAlignment="Stretch"
+                    Focusable="False"/>
 
                 <!-- Expand/Collapse button and glyph -->
                 <Button
@@ -58,20 +59,29 @@
                     platformimaging:ImageThemingUtilities.ImageBackgroundColor="{Binding Path=Background, ElementName=Outline, Converter={StaticResource BrushToColorConverter}}" >
                     <Button.Style>
                         <Style TargetType="Button">
+                            <Setter Property="IsTabStop" Value="True"/>
+                            <Setter Property="Focusable" Value="True"/>
                             <Setter Property="Template">
                                 <Setter.Value>
                                     <ControlTemplate TargetType="Button">
                                         <Border Name="border"
                                         BorderThickness="1"
+                                        BorderBrush="Transparent"
                                         Background="{TemplateBinding Background}">
                                             <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" />
                                         </Border>
+
+                                        <ControlTemplate.Triggers>
+                                            <Trigger Property="IsKeyboardFocused" Value="True">
+                                                <Setter TargetName="border" Property="BorderBrush" Value="{DynamicResource {x:Static vsui:EnvironmentColors.SnaplinesBrushKey}}" />
+                                            </Trigger>
+                                        </ControlTemplate.Triggers>
                                     </ControlTemplate>
                                 </Setter.Value>
                             </Setter>
                         </Style>
                     </Button.Style>
-                    <imaging:CrispImage Grid.Column="0">
+                    <imaging:CrispImage Focusable="False" Grid.Column="0">
                         <imaging:CrispImage.Style>
                             <Style TargetType="imaging:CrispImage">
                                 <Style.Triggers>
@@ -109,15 +119,19 @@
 
             <StackPanel Orientation="Vertical" Visibility="{Binding IsExpanded, Converter={StaticResource BooleanToVisibilityConverter}}">
                 <CheckBox Content="{Binding ElementName=control, Path=RenameOverloads}" Margin="0,5,0,0" IsChecked="{Binding Path=RenameOverloadFlag, Mode=TwoWay}"
-                      Name="OverloadsCheckbox" Visibility="{Binding IsRenameOverloadsVisible, Converter={StaticResource BooleanToVisibilityConverter}, Mode=OneWay}" IsEnabled="{Binding IsRenameOverloadsEditable}" />
-                <CheckBox Name="CommentsCheckbox" Content="{Binding ElementName=control, Path=SearchInComments}" Margin="0,5,0,0" IsChecked="{Binding Path=RenameInCommentsFlag, Mode=TwoWay}" />
-                <CheckBox Name="StringsCheckbox" Content="{Binding ElementName=control, Path=SearchInStrings}" Margin="0,5,0,0" IsChecked="{Binding Path=RenameInStringsFlag, Mode=TwoWay}" />
+                    Name="OverloadsCheckbox" Visibility="{Binding IsRenameOverloadsVisible, Converter={StaticResource BooleanToVisibilityConverter}, Mode=OneWay}" IsEnabled="{Binding IsRenameOverloadsEditable}"
+                    IsTabStop="True" Focusable="True" />
+                <CheckBox Name="CommentsCheckbox" Content="{Binding ElementName=control, Path=SearchInComments}" Margin="0,5,0,0" IsChecked="{Binding Path=RenameInCommentsFlag, Mode=TwoWay}"
+                    IsTabStop="True" Focusable="True" />
+                <CheckBox Name="StringsCheckbox" Content="{Binding ElementName=control, Path=SearchInStrings}" Margin="0,5,0,0" IsChecked="{Binding Path=RenameInStringsFlag, Mode=TwoWay}"
+                    IsTabStop="True" Focusable="True" />
                 <CheckBox Name="FileRenameCheckbox"
                     Content="{Binding Path=FileRenameString}"
                     Margin="0,5,0,0"
                     IsChecked="{Binding Path=RenameFileFlag, Mode=TwoWay}"
                     IsEnabled="{Binding Path=AllowFileRename, Mode=OneWay}"
-                    Visibility="{Binding Path=ShowFileRename, Converter={StaticResource BooleanToVisibilityConverter}, Mode=OneWay}"/>
+                    Visibility="{Binding Path=ShowFileRename, Converter={StaticResource BooleanToVisibilityConverter}, Mode=OneWay}"
+                    IsTabStop="True" Focusable="True" />
             </StackPanel>
 
             <TextBlock
diff --git a/src/EditorFeatures/Core/InlineRename/UI/Adornment/RenameFlyout.xaml.cs b/src/EditorFeatures/Core/InlineRename/UI/Adornment/RenameFlyout.xaml.cs
index 2bca898670fe3..cee46d1a54a79 100644
--- a/src/EditorFeatures/Core/InlineRename/UI/Adornment/RenameFlyout.xaml.cs
+++ b/src/EditorFeatures/Core/InlineRename/UI/Adornment/RenameFlyout.xaml.cs
@@ -48,6 +48,12 @@ public RenameFlyout(
 
         RenameUserInput = _viewModel.SmartRenameViewModel is null ? new RenameUserInputTextBox(_viewModel) : new SmartRenameUserInputComboBox(_viewModel);
 
+        if (RenameUserInput is Control renameControl)
+        {
+            renameControl.IsTabStop = true;
+            renameControl.Focusable = true;
+        }
+
         // On load focus the first tab target
         var token1 = _listener.BeginAsyncOperation(nameof(RenameUserInput.GotFocus));
         Loaded += (s, e) =>
@@ -183,21 +189,6 @@ private void Adornment_KeyDown(object sender, KeyEventArgs e)
                 _viewModel.Cancel();
                 break;
 
-            case Key.Tab:
-                // We don't want tab to lose focus for the adornment, so manually
-                // loop focus back to the first item that is focusable.
-                var lastItem = _viewModel.IsExpanded
-                    ? FileRenameCheckbox
-                    : (FrameworkElement)RenameUserInput;
-
-                if (lastItem.IsFocused)
-                {
-                    e.Handled = true;
-                    MoveFocus(new TraversalRequest(FocusNavigationDirection.First));
-                }
-
-                break;
-
             case Key.Space:
                 if (Keyboard.Modifiers == ModifierKeys.Control)
                 {
@@ -208,6 +199,7 @@ private void Adornment_KeyDown(object sender, KeyEventArgs e)
                         e.Handled = true;
                     }
                 }
+
                 break;
         }
     }
@@ -217,15 +209,6 @@ private void Adornment_ConsumeMouseEvent(object sender, MouseButtonEventArgs e)
         e.Handled = true;
     }
 
-    private void Adornment_GotKeyboardFocus(object sender, KeyboardFocusChangedEventArgs e)
-    {
-        if (e.NewFocus != RenameUserInput)
-        {
-            RenameUserInput.Focus();
-            e.Handled = true;
-        }
-    }
-
     private void ToggleExpand(object sender, RoutedEventArgs e)
     {
         _viewModel.IsExpanded = !_viewModel.IsExpanded;