diff --git a/flatland/utils/editor.py b/flatland/utils/editor.py
index 2adbf6bc87ecd6bcca7f8cc0a031cf7a66c20c70..eee17415ab147efee0eeabd83627bd231cc6dd3d 100644
--- a/flatland/utils/editor.py
+++ b/flatland/utils/editor.py
@@ -743,6 +743,8 @@ class EditorModel(object):
         # Has the user clicked on an existing agent?
         iAgent = self.find_agent_at(rcCell)
 
+        print("sel:", iAgent, self.iSelectedAgent)
+
         if iAgent is None:
             # No
             if self.iSelectedAgent is None:
@@ -754,6 +756,8 @@ class EditorModel(object):
                 # Move the selected agent to this cell
                 agent_static = self.env.agents_static[self.iSelectedAgent]
                 agent_static.position = rcCell
+                agent_static.old_position = rcCell
+                self.env.agents = []
         else:
             # Yes
             # Have they clicked on the agent already selected?