Made the implementation of moving using edit tool yet even more robust.
Now, seemingly, working appropriately.

Signed-off-by: Jakob Brandsborg Ehmsen <jakobehmsen.github@gmail.com>