diff --git a/source/iNKORE.UI.WPF.Modern/Themes/Controls/ContextMenu.xaml b/source/iNKORE.UI.WPF.Modern/Themes/Controls/ContextMenu.xaml
index 9a13fbee..60b49204 100644
--- a/source/iNKORE.UI.WPF.Modern/Themes/Controls/ContextMenu.xaml
+++ b/source/iNKORE.UI.WPF.Modern/Themes/Controls/ContextMenu.xaml
@@ -17,6 +17,9 @@
         <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
         <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
         <Setter Property="FontStyle" Value="Normal" />
+        <Setter Property="IsTabStop" Value="False" />
+        <Setter Property="KeyboardNavigation.TabNavigation" Value="None" />
+        <Setter Property="KeyboardNavigation.IsTabStop" Value="False" />
         <Setter Property="FontWeight" Value="Normal" />
         <Setter Property="Grid.IsSharedSizeScope" Value="true" />
         <Setter Property="HasDropShadow" Value="{DynamicResource {x:Static SystemParameters.DropShadowKey}}" />
@@ -49,6 +52,7 @@
                                                                               TypeInTargetAssembly={x:Type FrameworkElement}}}">
                                 <ItemsPresenter
                                     KeyboardNavigation.DirectionalNavigation="Cycle"
+                                    KeyboardNavigation.TabNavigation="None"
                                     RenderOptions.ClearTypeHint="Enabled"
                                     SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                             </local:ScrollViewerEx>
diff --git a/source/iNKORE.UI.WPF.Modern/Themes/Controls/MenuItem.xaml b/source/iNKORE.UI.WPF.Modern/Themes/Controls/MenuItem.xaml
index 1046cadf..a0249bf0 100644
--- a/source/iNKORE.UI.WPF.Modern/Themes/Controls/MenuItem.xaml
+++ b/source/iNKORE.UI.WPF.Modern/Themes/Controls/MenuItem.xaml
@@ -126,7 +126,7 @@
                                 <ItemsPresenter
                                     Grid.IsSharedSizeScope="true"
                                     KeyboardNavigation.DirectionalNavigation="Cycle"
-                                    KeyboardNavigation.TabNavigation="Cycle"
+                                    KeyboardNavigation.TabNavigation="None"
                                     RenderOptions.ClearTypeHint="Enabled"
                                     SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                             </local:ScrollViewerEx>
@@ -342,7 +342,7 @@
                                 <ItemsPresenter
                                     Grid.IsSharedSizeScope="true"
                                     KeyboardNavigation.DirectionalNavigation="Cycle"
-                                    KeyboardNavigation.TabNavigation="Cycle"
+                                    KeyboardNavigation.TabNavigation="None"
                                     RenderOptions.ClearTypeHint="Enabled"
                                     SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                             </local:ScrollViewerEx>
@@ -402,6 +402,7 @@
         <Setter Property="Padding" Value="{DynamicResource MenuFlyoutItemThemePadding}" />
         <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+        <Setter Property="KeyboardNavigation.TabNavigation" Value="None" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
         <Setter Property="ScrollViewer.PanningMode" Value="Both" />
         <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
@@ -416,7 +417,6 @@
                 <Setter Property="BorderThickness" Value="{DynamicResource MenuBarItemBorderThickness}" />
                 <Setter Property="Template" Value="{DynamicResource {ComponentResourceKey TypeInTargetAssembly={x:Type MenuItem}, ResourceId=TopLevelHeaderTemplateKey}}" />
                 <Setter Property="VerticalContentAlignment" Value="Stretch" />
-                <Setter Property="IsTabStop" Value="True" />
                 <Setter Property="Header" Value="Item" />
                 <Setter Property="Height" Value="{DynamicResource MenuBarHeight}" />
             </Trigger>
@@ -426,7 +426,6 @@
                 <Setter Property="BorderThickness" Value="{DynamicResource MenuBarItemBorderThickness}" />
                 <Setter Property="Template" Value="{DynamicResource {ComponentResourceKey TypeInTargetAssembly={x:Type MenuItem}, ResourceId=TopLevelItemTemplateKey}}" />
                 <Setter Property="VerticalContentAlignment" Value="Stretch" />
-                <Setter Property="IsTabStop" Value="True" />
                 <Setter Property="Header" Value="Item" />
                 <Setter Property="Height" Value="{DynamicResource MenuBarHeight}" />
             </Trigger>