diff --git a/src/Gui/TinkerCADNavigationStyle.cpp b/src/Gui/TinkerCADNavigationStyle.cpp
index a35632f7bd..ff8e8ee85d 100644
--- a/src/Gui/TinkerCADNavigationStyle.cpp
+++ b/src/Gui/TinkerCADNavigationStyle.cpp
@@ -224,6 +224,9 @@ SbBool TinkerCADNavigationStyle::processSoEvent(const SoEvent * const ev)
         newmode = NavigationStyle::SELECTION;
         break;
     case BUTTON2DOWN:
+        if (newmode != NavigationStyle::DRAGGING) {
+            saveCursorPosition(ev);
+        }
         newmode = NavigationStyle::DRAGGING;
         break;
     case BUTTON3DOWN: