diff --git a/src/Gui/Navigation/OpenSCADNavigationStyle.cpp b/src/Gui/Navigation/OpenSCADNavigationStyle.cpp
index 9302b5d9b0..7de990c58d 100644
--- a/src/Gui/Navigation/OpenSCADNavigationStyle.cpp
+++ b/src/Gui/Navigation/OpenSCADNavigationStyle.cpp
@@ -187,9 +187,14 @@ SbBool OpenSCADNavigationStyle::processSoEvent(const SoEvent * const ev)
         this->lockrecenter = true;
         const auto event = (const SoLocation2Event *) ev;
         if (!viewer->isEditing() && curmode == NavigationStyle::SELECTION) {
-            newmode = NavigationStyle::DRAGGING;
-            saveCursorPosition(ev);
-            this->centerTime = ev->getTime();
+            if (button1down && isDraggerUnderCursor(ev->getPosition())) {
+                newmode = NavigationStyle::INTERACT;
+            }
+            else {
+                newmode = NavigationStyle::DRAGGING;
+                saveCursorPosition(ev);
+                this->centerTime = ev->getTime();
+            }
         }
         else if (curmode == NavigationStyle::ZOOMING) {
             // OpenSCAD uses vertical mouse position, not horizontal
@@ -241,7 +246,7 @@ SbBool OpenSCADNavigationStyle::processSoEvent(const SoEvent * const ev)
         newmode = NavigationStyle::IDLE;
         break;
     case BUTTON1DOWN:
-        if (newmode != NavigationStyle::DRAGGING)
+        if (newmode != NavigationStyle::DRAGGING && newmode != NavigationStyle::INTERACT) 
             newmode = NavigationStyle::SELECTION;
         break;
     case BUTTON2DOWN: