diff --git a/src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/ClassDiagramCommand.cs b/src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/ClassDiagramCommand.cs
index d8c937ae25..6c63a57c55 100644
--- a/src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/ClassDiagramCommand.cs
+++ b/src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/ClassDiagramCommand.cs
@@ -92,7 +92,7 @@ namespace ClassDiagramAddin
 		{
 			get
 			{
-				ToolStrip ts = ((ToolBarComboBox)this.Owner).Owner;
+				ToolStrip ts = ((ToolBarComboBox)this.ComboBox).Owner;
 				if (ts != null)
 					return (ClassCanvas)ts.Parent;
 				return null;
@@ -119,7 +119,7 @@ namespace ClassDiagramAddin
 		protected override void OnOwnerChanged(EventArgs e)
 		{
 			base.OnOwnerChanged(e);
-			ToolBarComboBox box1 = (ToolBarComboBox) this.Owner;
+			ToolBarComboBox box1 = (ToolBarComboBox) this.ComboBox;
 			comboBox = box1.ComboBox;
 			comboBox.DropDownStyle = ComboBoxStyle.DropDown;
 			comboBox.Items.AddRange(new object[] {"10%", "25%", "50%", "75%",