diff --git a/CustomWidgets/SimpleButton.cs b/CustomWidgets/SimpleButton.cs
index 34a1a66ad..11673ea83 100644
--- a/CustomWidgets/SimpleButton.cs
+++ b/CustomWidgets/SimpleButton.cs
@@ -267,5 +267,4 @@ namespace MatterHackers.MatterControl.CustomWidgets
 			}
 		}
 	}
-
 }
\ No newline at end of file
diff --git a/PartPreviewWindow/SelectedObjectPanel.cs b/PartPreviewWindow/SelectedObjectPanel.cs
index d9554a4fc..7ee44ff80 100644
--- a/PartPreviewWindow/SelectedObjectPanel.cs
+++ b/PartPreviewWindow/SelectedObjectPanel.cs
@@ -78,7 +78,10 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 			var buttonMargin = new BorderDouble(2, 5);
 
 			// put in the button for making the behavior solid
-			var solidButtonView = theme.ButtonFactory.Generate("Color".Localize());
+			var solidButtonView = new TextButton("Color".Localize(), theme)
+			{
+				BackgroundColor = theme.MinimalShade
+			};
 			var solidBehaviorButton = new PopupButton(solidButtonView)
 			{
 				Name = "Solid Colors",
@@ -88,7 +91,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 					HAnchor = HAnchor.Fit,
 					VAnchor = VAnchor.Fit,
 				},
-				Margin = buttonMargin
 			};
 			solidBehaviorButton.Click += (s, e) =>
 			{
@@ -97,7 +99,11 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 
 			behavior3DTypeButtons.AddChild(solidBehaviorButton);
 
-			var editButton = new TextButton("Edit", theme);
+			editButton = new TextButton("Edit", theme)
+			{
+				BackgroundColor = theme.MinimalShade,
+				Margin = theme.ButtonSpacing
+			};
 			editButton.Click += async (s, e) =>
 			{
 				BedConfig bed;
@@ -117,7 +123,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 			};
 			behavior3DTypeButtons.AddChild(editButton);
 
-
 			this.AddChild(editorPanel = new FlowLayoutWidget(FlowDirection.TopToBottom)
 			{
 				Name = "editorPanel",
@@ -154,6 +159,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 				return;
 			}
 
+			editButton.Enabled = (selectedItem.Children.Count > 0);
+
 			this.itemName.Text = selectedItem.Name ?? selectedItem.GetType().Name;
 
 			this.item = selectedItem;
@@ -239,6 +246,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 		}
 
 		private GuiWidget activeEditorWidget;
+		private TextButton editButton;
 
 		private void ShowObjectEditor(IObject3DEditor editor)
 		{