diff --git a/swing/src/net/sf/openrocket/gui/adaptors/DoubleModel.java b/swing/src/net/sf/openrocket/gui/adaptors/DoubleModel.java
index 4e121af26..f605d0d0c 100644
--- a/swing/src/net/sf/openrocket/gui/adaptors/DoubleModel.java
+++ b/swing/src/net/sf/openrocket/gui/adaptors/DoubleModel.java
@@ -773,6 +773,14 @@ public class DoubleModel implements StateChangeListener, ChangeSource, Invalidat
 	 */
 	public void setValue(double v) {
 		checkState(true);
+
+		if (v > maxValue) {
+			log.debug("Clipping value " + v + " to maximum " + maxValue + " for " + this);
+			v = maxValue;
+		} else if (v < minValue) {
+			log.debug("Clipping value " + v + " to minimum " + minValue + " for " + this);
+			v = minValue;
+		}
 		
 		log.debug("Setting value " + v + " for " + this);
 		if (setMethod == null) {