Index: Core/Plugins/src/Core.Plugins.Chart/Legend/ChartLegendView.cs
===================================================================
diff -u -r1d6350fd6978149c7ad522faba18855f8119462f -r3c339fdfccd701b8b6d3ee46742d3af9120125d2
--- Core/Plugins/src/Core.Plugins.Chart/Legend/ChartLegendView.cs	(.../ChartLegendView.cs)	(revision 1d6350fd6978149c7ad522faba18855f8119462f)
+++ Core/Plugins/src/Core.Plugins.Chart/Legend/ChartLegendView.cs	(.../ChartLegendView.cs)	(revision 3c339fdfccd701b8b6d3ee46742d3af9120125d2)
@@ -115,7 +115,7 @@
                 ChildNodeObjects = ChartDataContextGetChildNodeObjects,
                 CanDrag = (context, o) => !(context.WrappedData is ChartMultipleAreaData),
                 CanCheck = context => !(context.WrappedData is ChartDataCollection),
-                CheckedState = context => context.WrappedData.IsVisible,
+                CheckedState = context => context.WrappedData.IsVisible ? TreeNodeCheckedState.Checked :  TreeNodeCheckedState.Unchecked,
                 OnNodeChecked = ChartDataContextOnNodeChecked,
                 CanDrop = ChartDataContextCanDropAndInsert,
                 CanInsert = ChartDataContextCanDropAndInsert,
Index: Core/Plugins/src/Core.Plugins.Map/Legend/MapLegendView.cs
===================================================================
diff -u -r1d6350fd6978149c7ad522faba18855f8119462f -r3c339fdfccd701b8b6d3ee46742d3af9120125d2
--- Core/Plugins/src/Core.Plugins.Map/Legend/MapLegendView.cs	(.../MapLegendView.cs)	(revision 1d6350fd6978149c7ad522faba18855f8119462f)
+++ Core/Plugins/src/Core.Plugins.Map/Legend/MapLegendView.cs	(.../MapLegendView.cs)	(revision 3c339fdfccd701b8b6d3ee46742d3af9120125d2)
@@ -123,7 +123,7 @@
                 Image = GetImage,
                 CanDrag = (context, parent) => true,
                 CanCheck = context => true,
-                CheckedState = context => context.WrappedData.IsVisible,
+                CheckedState = context => context.WrappedData.IsVisible ? TreeNodeCheckedState.Checked  : TreeNodeCheckedState.Unchecked,
                 OnNodeChecked = FeatureBasedMapDataContextOnNodeChecked,
                 CanRemove = (context, parent) => CanRemoveMapData((FeatureBasedMapData) context.WrappedData, parent),
                 OnNodeRemoved = (context, parent) => RemoveFromParent((FeatureBasedMapData) context.WrappedData, parent),
@@ -137,7 +137,7 @@
                 ChildNodeObjects = GetCollectionChildNodeObjects,
                 CanDrag = (context, parentData) => context.ParentMapData != null,
                 CanCheck = context => true,
-                CheckedState = context => context.WrappedData.IsVisible,
+                CheckedState = context => context.WrappedData.IsVisible ? TreeNodeCheckedState.Checked : TreeNodeCheckedState.Unchecked,
                 OnNodeChecked = MapDataCollectionContextOnNodeChecked,
                 CanDrop = MapDataCollectionCanDropAndInsert,
                 CanInsert = MapDataCollectionCanDropAndInsert,