diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/PanelMoveAdorner.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/PanelMoveAdorner.cs
index 67af9e46cd..911c814889 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/PanelMoveAdorner.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/PanelMoveAdorner.cs
@@ -27,7 +27,7 @@ namespace ICSharpCode.WpfDesign.Designer.Controls
 		protected override void OnMouseLeftButtonDown(MouseButtonEventArgs e)
 		{
 			e.Handled = true;
-			new DragMoveMouseGesture(item, false).Start(item.Services.Tool.DesignPanel, e);
+			new DragMoveMouseGesture(item, false).Start(item.Services.DesignPanel, e);
 		}
 	}
 }
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Extensions/SnaplinePlacementBehavior.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Extensions/SnaplinePlacementBehavior.cs
index b29ea43538..b540256d05 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Extensions/SnaplinePlacementBehavior.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Extensions/SnaplinePlacementBehavior.cs
@@ -146,7 +146,7 @@ namespace ICSharpCode.WpfDesign.Designer.Extensions
 				adornerPanel.SetAdornedElement(ExtendedItem.View, ExtendedItem);
 				AdornerPanel.SetPlacement(surface, AdornerPlacement.FillContent);
 				adornerPanel.Children.Add(surface);
-				ExtendedItem.Services.Tool.DesignPanel.Adorners.Add(adornerPanel);
+				ExtendedItem.Services.DesignPanel.Adorners.Add(adornerPanel);
 
 				BuildMaps(operation);
 
@@ -207,7 +207,7 @@ namespace ICSharpCode.WpfDesign.Designer.Extensions
 		void DeleteSurface() 
 		{
 			if (surface != null) {
-				ExtendedItem.Services.Tool.DesignPanel.Adorners.Remove(adornerPanel);
+				ExtendedItem.Services.DesignPanel.Adorners.Remove(adornerPanel);
 				adornerPanel = null;
 				surface = null;
 				horizontalMap = null;