diff --git a/swing/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java
index 30f169bf9..9ffc91f97 100644
--- a/swing/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java
+++ b/swing/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java
@@ -369,7 +369,11 @@ public class RocketComponentConfig extends JPanel {
 			separationSpinner.setEditor(new SpinnerEditor(separationSpinner));
 			panel.add(separationSpinner, "growx");
 			panel.add(new UnitSelector(separationModel), "growx");
-			panel.add(new BasicSlider(separationModel.getSliderModel(0, 0.001, 0.02)), "w 100lp, wrap para");
+			double maxSeparationDistance = 0.1;
+			if (component.getParent() != null && component.getParent().getLength() > 0) {
+				maxSeparationDistance = component.getParent().getLength();
+			}
+			panel.add(new BasicSlider(separationModel.getSliderModel(0, 0.001, maxSeparationDistance)), "w 100lp, wrap para");
 		}
 		return panel;
 	}