diff --git a/swing/src/net/sf/openrocket/gui/configdialog/FreeformFinSetConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/FreeformFinSetConfig.java
index dff8e0349..6e6a3e29c 100644
--- a/swing/src/net/sf/openrocket/gui/configdialog/FreeformFinSetConfig.java
+++ b/swing/src/net/sf/openrocket/gui/configdialog/FreeformFinSetConfig.java
@@ -424,7 +424,8 @@ public class FreeformFinSetConfig extends FinSetConfig {
 			Point2D.Double point = getCoordinates(event);
 			finset.setPoint(dragIndex, point.x, point.y);
 
-			if(0 == dragIndex && 0 > point.x){
+			final double bodyFront = -finset.getAxialFront();
+			if(0 == dragIndex && bodyFront > point.x){
 				dragIndex = 1;
 			}