Index: Core/Plugins/src/Core.Plugins.Chart/Legend/ChartLegendView.cs
===================================================================
diff -u -r31d4921763c045040f9300542aed356147966cc8 -r0db047df16dd6692858c810fa5ca0ccb206df9c0
--- Core/Plugins/src/Core.Plugins.Chart/Legend/ChartLegendView.cs	(.../ChartLegendView.cs)	(revision 31d4921763c045040f9300542aed356147966cc8)
+++ Core/Plugins/src/Core.Plugins.Chart/Legend/ChartLegendView.cs	(.../ChartLegendView.cs)	(revision 0db047df16dd6692858c810fa5ca0ccb206df9c0)
@@ -144,7 +144,7 @@
             var draggedDataContext = (ChartDataContext) draggedData;
             var targetDataContext = (ChartDataContext) targetData;
 
-            return !(targetDataContext.WrappedData is ChartDataCollection) && draggedDataContext.ParentChartData.Equals(targetDataContext.ParentChartData);
+            return draggedDataContext.ParentChartData.Equals(targetDataContext.WrappedData);
         }
 
         private void ChartDataContextOnDrop(object droppedData, object newParentData, object oldParentData, int position, TreeViewControl control)
Index: Core/Plugins/src/Core.Plugins.Chart/PresentationObjects/ChartDataContext.cs
===================================================================
diff -u -r31d4921763c045040f9300542aed356147966cc8 -r0db047df16dd6692858c810fa5ca0ccb206df9c0
--- Core/Plugins/src/Core.Plugins.Chart/PresentationObjects/ChartDataContext.cs	(.../ChartDataContext.cs)	(revision 31d4921763c045040f9300542aed356147966cc8)
+++ Core/Plugins/src/Core.Plugins.Chart/PresentationObjects/ChartDataContext.cs	(.../ChartDataContext.cs)	(revision 0db047df16dd6692858c810fa5ca0ccb206df9c0)
@@ -28,7 +28,7 @@
     /// <summary>
     /// Presentation object for <see cref="ChartData"/>.
     /// </summary>
-    public class ChartDataContext : WrappedObjectContextBase<ChartData>
+    public class ChartDataContext : ObservableWrappedObjectContextBase<ChartData>
     {
         private readonly ChartDataCollection parentChartData;
 
Index: Core/Plugins/test/Core.Plugins.Chart.Test/Legend/ChartDataContextTreeNodeInfoTest.cs
===================================================================
diff -u -r31d4921763c045040f9300542aed356147966cc8 -r0db047df16dd6692858c810fa5ca0ccb206df9c0
--- Core/Plugins/test/Core.Plugins.Chart.Test/Legend/ChartDataContextTreeNodeInfoTest.cs	(.../ChartDataContextTreeNodeInfoTest.cs)	(revision 31d4921763c045040f9300542aed356147966cc8)
+++ Core/Plugins/test/Core.Plugins.Chart.Test/Legend/ChartDataContextTreeNodeInfoTest.cs	(.../ChartDataContextTreeNodeInfoTest.cs)	(revision 0db047df16dd6692858c810fa5ca0ccb206df9c0)
@@ -242,15 +242,14 @@
         }
 
         [Test]
-        public void CanDrop_TargetParentIsSameAsSourceParent_ReturnsTrue()
+        public void CanDrop_TargetIsSameAsSourceParent_ReturnsTrue()
         {
             // Setup
             ChartData chartData = new TestChartData();
-            ChartData chartData2 = new TestChartData();
             ChartDataCollection chartDataCollection = new ChartDataCollection(new ChartData[0], "test");
 
             ChartDataContext context = GetContext(chartData, chartDataCollection);
-            ChartDataContext targetContext = GetContext(chartData2, chartDataCollection);
+            ChartDataContext targetContext = GetContext(chartDataCollection);
 
             // Call
             bool canDrop = info.CanDrop(context, targetContext);
@@ -295,15 +294,14 @@
         }
 
         [Test]
-        public void CanInsert_TargetParentIsSameAsSourceParent_ReturnsTrue()
+        public void CanInsert_TargetIsSameAsSourceParent_ReturnsTrue()
         {
             // Setup
             ChartData chartData = new TestChartData();
-            ChartData chartData2 = new TestChartData();
             ChartDataCollection chartDataCollection = new ChartDataCollection(new ChartData[0], "test");
 
             ChartDataContext context = GetContext(chartData, chartDataCollection);
-            ChartDataContext targetContext = GetContext(chartData2, chartDataCollection);
+            ChartDataContext targetContext = GetContext(chartDataCollection);
 
             // Call
             bool canInsert = info.CanInsert(context, targetContext);
Index: Core/Plugins/test/Core.Plugins.Chart.Test/PresentationObjects/ChartDataContextTest.cs
===================================================================
diff -u -r31d4921763c045040f9300542aed356147966cc8 -r0db047df16dd6692858c810fa5ca0ccb206df9c0
--- Core/Plugins/test/Core.Plugins.Chart.Test/PresentationObjects/ChartDataContextTest.cs	(.../ChartDataContextTest.cs)	(revision 31d4921763c045040f9300542aed356147966cc8)
+++ Core/Plugins/test/Core.Plugins.Chart.Test/PresentationObjects/ChartDataContextTest.cs	(.../ChartDataContextTest.cs)	(revision 0db047df16dd6692858c810fa5ca0ccb206df9c0)
@@ -20,6 +20,7 @@
 // All rights reserved.
 
 using System;
+using Core.Common.Controls.PresentationObjects;
 using Core.Components.Charting.Data;
 using Core.Components.Charting.TestUtil;
 using Core.Plugins.Chart.PresentationObjects;
@@ -41,6 +42,7 @@
             ChartDataContext context = new ChartDataContext(data, collection);
 
             // Assert
+            Assert.IsInstanceOf<ObservableWrappedObjectContextBase<ChartData>>(context);
             Assert.AreSame(data, context.WrappedData);
             Assert.AreSame(collection, context.ParentChartData);
         }