diff --git a/src/constraint.cpp b/src/constraint.cpp
index 8ab76f2..fb5c74c 100644
--- a/src/constraint.cpp
+++ b/src/constraint.cpp
@@ -196,9 +196,6 @@ void Constraint::MenuConstrain(Command id) {
             c.valA = 0;
             c.ModifyToSatisfy();
             AddConstraint(&c);
-            if (SS.immediatelyEditDimension) {
-                SS.GW.EditConstraint(c.h);
-            }
             break;
         }
 
@@ -610,9 +607,6 @@ void Constraint::MenuConstrain(Command id) {
 
             c.ModifyToSatisfy();
             AddConstraint(&c);
-            if (SS.immediatelyEditDimension) {
-                SS.GW.EditConstraint(c.h);
-            }
             break;
         }
 
@@ -769,6 +763,10 @@ void Constraint::MenuConstrain(Command id) {
         }
     }
 
+    if ((id == Command::DISTANCE_DIA || id == Command::ANGLE) && SS.immediatelyEditDimension) {
+        SS.GW.EditConstraint(c.h);
+    }
+
     SS.GW.ClearSelection();
 }