diff --git a/swing/src/net/sf/openrocket/gui/configdialog/ComponentConfigDialog.java b/swing/src/net/sf/openrocket/gui/configdialog/ComponentConfigDialog.java
index 3566cf3e9..c244e4ccd 100644
--- a/swing/src/net/sf/openrocket/gui/configdialog/ComponentConfigDialog.java
+++ b/swing/src/net/sf/openrocket/gui/configdialog/ComponentConfigDialog.java
@@ -230,8 +230,9 @@ public class ComponentConfigDialog extends JDialog implements ComponentChangeLis
 	 * @param document		the document to configure.
 	 * @param component		the component to configure.
 	 * @param rememberPreviousTab if true, the previous tab will be remembered and used for the new dialog
+	 * @param includeUndoModify	if true, include a 'Modify component' undo action
 	 */
-	public static void showDialog(Window parent, OpenRocketDocument document, RocketComponent component, boolean rememberPreviousTab) {
+	public static void showDialog(Window parent, OpenRocketDocument document, RocketComponent component, boolean rememberPreviousTab, boolean includeUndoModify) {
 		if (dialog != null) {
 			// Don't remember the previous tab for rockets or stages, because this will leave you in the override tab for
 			// the next component, which is generally not what you want.
@@ -258,13 +259,27 @@ public class ComponentConfigDialog extends JDialog implements ComponentChangeLis
 		dialog.setVisible(true);
 
 		////Modify
-		if (component.getConfigListeners().size() == 0) {
-			document.addUndoPosition(trans.get("ComponentCfgDlg.Modify") + " " + component.getComponentName());
-		} else {
-			document.addUndoPosition(trans.get("ComponentCfgDlg.ModifyComponents"));
+		if (includeUndoModify) {
+			if (component.getConfigListeners().size() == 0) {
+				document.addUndoPosition(trans.get("ComponentCfgDlg.Modify") + " " + component.getComponentName());
+			} else {
+				document.addUndoPosition(trans.get("ComponentCfgDlg.ModifyComponents"));
+			}
 		}
 	}
 
+	/**
+	 * A singleton configuration dialog.  Will create and show a new dialog if one has not
+	 * previously been used, or update the dialog and show it if a previous one exists.
+	 *
+	 * @param document		the document to configure.
+	 * @param component		the component to configure.
+	 * @param rememberPreviousTab if true, the previous tab will be remembered and used for the new dialog
+	 */
+	public static void showDialog(Window parent, OpenRocketDocument document, RocketComponent component, boolean rememberPreviousTab) {
+		ComponentConfigDialog.showDialog(parent, document, component, rememberPreviousTab, true);
+	}
+
 	/**
 	 * A singleton configuration dialog.  Will create and show a new dialog if one has not
 	 * previously been used, or update the dialog and show it if a previous one exists.
diff --git a/swing/src/net/sf/openrocket/gui/main/ComponentAddButtons.java b/swing/src/net/sf/openrocket/gui/main/ComponentAddButtons.java
index 8ed2338c9..0ff03e261 100644
--- a/swing/src/net/sf/openrocket/gui/main/ComponentAddButtons.java
+++ b/swing/src/net/sf/openrocket/gui/main/ComponentAddButtons.java
@@ -488,7 +488,7 @@ public class ComponentAddButtons extends JPanel implements Scrollable {
 				}
 			}
 			
-			ComponentConfigDialog.showDialog(parent, document, component, false);
+			ComponentConfigDialog.showDialog(parent, document, component, false, false);
 		}
 	}