diff --git a/direct/src/directtools/DirectManipulation.py b/direct/src/directtools/DirectManipulation.py
index e1f471ccb4..6e56d12f18 100644
--- a/direct/src/directtools/DirectManipulation.py
+++ b/direct/src/directtools/DirectManipulation.py
@@ -102,8 +102,9 @@ class DirectManipulationControl(PandaObject):
                 direct.select(entry.getIntoNodePath(), direct.fShift)
             else:
                 direct.deselectAll()
-        else:
+        elif self.mode == 'move':
             self.manipulateObjectCleanup()
+        self.mode = None
 
     def manipulateObjectCleanup(self):
         if self.fScaling: