diff --git a/src/modules/windowwalker/app/Window Walker/MainWindow.xaml b/src/modules/windowwalker/app/Window Walker/MainWindow.xaml
index 749cde73bb..4d628731fe 100644
--- a/src/modules/windowwalker/app/Window Walker/MainWindow.xaml	
+++ b/src/modules/windowwalker/app/Window Walker/MainWindow.xaml	
@@ -29,7 +29,7 @@
             <local:WindowSearchResultToXamlConverter x:Key="windowSearchResultToXamlConverter"/>
         </ResourceDictionary>
     </Window.Resources>
-    <Grid>
+    <Grid KeyboardNavigation.TabNavigation="None">
         <StackPanel Margin="1" Orientation="Vertical">
             <TextBox x:Name="searchBox" Text="{Binding SearchText, UpdateSourceTrigger=PropertyChanged}" FontSize="40" Margin="10" KeyUp="SearchBoxKeyUp" materialDesign:HintAssist.Hint="{Binding Hint}" materialDesign:HintAssist.HintOpacity="0.2"/>
             <ListBox x:Name="results" ItemsSource="{Binding Results}" SelectedItem="{Binding SelectedWindowResult}" HorizontalContentAlignment="Stretch" MouseDoubleClick="Results_MouseDoubleClick">
diff --git a/src/modules/windowwalker/app/Window Walker/MainWindow.xaml.cs b/src/modules/windowwalker/app/Window Walker/MainWindow.xaml.cs
index e505c8d11a..9fe480afa9 100644
--- a/src/modules/windowwalker/app/Window Walker/MainWindow.xaml.cs	
+++ b/src/modules/windowwalker/app/Window Walker/MainWindow.xaml.cs	
@@ -68,14 +68,14 @@ namespace WindowWalker
                     viewModel.WindowHideCommand.Execute(null);
                 }
             }
-            else if (e.Key == Key.Down)
+            else if (e.Key == Key.Down || (e.Key == Key.Tab && Keyboard.Modifiers != ModifierKeys.Shift))
             {
                 if (viewModel.WindowNavigateToNextResultCommand.CanExecute(null))
                 {
                     viewModel.WindowNavigateToNextResultCommand.Execute(null);
                 }
             }
-            else if (e.Key == Key.Up)
+            else if (e.Key == Key.Up || (e.Key == Key.Tab && Keyboard.Modifiers == ModifierKeys.Shift))
             {
                 if (viewModel.WindowNavigateToPreviousResultCommand.CanExecute(null))
                 {