diff --git a/swing/src/net/sf/openrocket/gui/configdialog/AppearancePanel.java b/swing/src/net/sf/openrocket/gui/configdialog/AppearancePanel.java
index b8c8c0eb3..5a5f5d768 100644
--- a/swing/src/net/sf/openrocket/gui/configdialog/AppearancePanel.java
+++ b/swing/src/net/sf/openrocket/gui/configdialog/AppearancePanel.java
@@ -576,13 +576,19 @@ public class AppearancePanel extends JPanel {
 		order.add(textureDropDown);
 		JButton editBtn = new SelectColorButton(
 				trans.get("AppearanceCfg.but.edit"));
-		editBtn.setEnabled(builder.getImage() != null);
+		editBtn.setEnabled(!materialDefault.isSelected() && builder.getImage() != null);
 		// Enable the editBtn only when the appearance builder has an Image
 		// assigned to it.
 		builder.addChangeListener(new StateChangeListener() {
 			@Override
 			public void stateChanged(EventObject e) {
-				editBtn.setEnabled(builder.getImage() != null);
+				editBtn.setEnabled(!materialDefault.isSelected() && builder.getImage() != null);
+			}
+		});
+		materialDefault.addActionListener(new ActionListener() {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				editBtn.setEnabled(!materialDefault.isSelected() && builder.getImage() != null);
 			}
 		});