diff --git a/source/Components/AvalonDock/DockingManager.cs b/source/Components/AvalonDock/DockingManager.cs
index bac38d0d..1c68e2c4 100644
--- a/source/Components/AvalonDock/DockingManager.cs
+++ b/source/Components/AvalonDock/DockingManager.cs
@@ -1882,9 +1882,7 @@ protected override void OnPreviewKeyDown(KeyEventArgs e)
 		/// <param name="e"></param>
 		private static void OnContextMenuPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
 		{
-			if (d.Dispatcher.CheckAccess() && 
-			    e.NewValue is ContextMenu contextMenu && 
-			    contextMenu.Dispatcher.CheckAccess())
+			if (e.NewValue is ContextMenu contextMenu)
 			{
 				contextMenu.Resources = ((DockingManager)d).Resources;
 			}
diff --git a/source/Components/AvalonDock/Themes/generic.xaml b/source/Components/AvalonDock/Themes/generic.xaml
index b958e806..f3bfad2d 100644
--- a/source/Components/AvalonDock/Themes/generic.xaml
+++ b/source/Components/AvalonDock/Themes/generic.xaml
@@ -662,8 +662,8 @@
 		<Setter Property="AnchorableHeaderTemplate" Value="{StaticResource AnchorableHeaderTemplate}" />
 		<Setter Property="DocumentTitleTemplate" Value="{StaticResource DocumentTitleTemplate}" />
 		<Setter Property="AnchorableTitleTemplate" Value="{StaticResource AnchorableTitleTemplate}" />
-		<Setter Property="AnchorableContextMenu" Value="{StaticResource AnchorableContextMenu}" />
-		<Setter Property="DocumentContextMenu" Value="{StaticResource DocumentContextMenu}" />
+		<Setter Property="AnchorableContextMenu" Value="{DynamicResource AnchorableContextMenu}" />
+		<Setter Property="DocumentContextMenu" Value="{DynamicResource DocumentContextMenu}" />
 		<Setter Property="DocumentPaneMenuItemHeaderTemplate" Value="{StaticResource DocumentHeaderTemplate}" />
 		<Setter Property="IconContentTemplate" Value="{StaticResource IconContentTemplate}" />
 		<Setter Property="Template">