diff --git a/rtgui/controllines.cc b/rtgui/controllines.cc
index 5918a75cb..c08fbd1d2 100644
--- a/rtgui/controllines.cc
+++ b/rtgui/controllines.cc
@@ -274,6 +274,9 @@ void ControlLineManager::releaseEdit(void)
     if (selected_object > 0) {
         mouseOverGeometry[selected_object]->state = Geometry::NORMAL;
     }
+    if (prev_obj > 0) {
+        visibleGeometry[prev_obj - 1]->state = Geometry::NORMAL;
+    }
 
     edited = true;
     callbacks->lineChanged();
diff --git a/rtgui/spot.cc b/rtgui/spot.cc
index 9911a9595..45fc3eec8 100644
--- a/rtgui/spot.cc
+++ b/rtgui/spot.cc
@@ -198,8 +198,8 @@ void Spot::releaseEdit()
         return;
     }
 
-    loGeom->state = Geometry::ACTIVE;
-    sourceIcon.state = Geometry::ACTIVE;
+    loGeom->state = Geometry::NORMAL;
+    sourceIcon.state = Geometry::NORMAL;
     EditSubscriber::action = EditSubscriber::Action::NONE;
     draggedSide = DraggedSide::NONE;
     updateGeometry();