diff --git a/src/Mod/TechDraw/Gui/QGVNavStyleTouchpad.cpp b/src/Mod/TechDraw/Gui/QGVNavStyleTouchpad.cpp
index a294003738..2c48acb866 100644
--- a/src/Mod/TechDraw/Gui/QGVNavStyleTouchpad.cpp
+++ b/src/Mod/TechDraw/Gui/QGVNavStyleTouchpad.cpp
@@ -113,8 +113,12 @@ void QGVNavStyleTouchpad::handleMouseMoveEvent(QMouseEvent *event)
 
     // if the mouse moves, but we are not zooming or panning, then we should make
     // sure that zoom and pan are turned off.
-    stopPan();
-    stopZoom();
+    if (panningActive) {
+        stopPan();
+    }
+    if (zoomingActive) {
+        stopZoom();
+    }
 }
 
 void QGVNavStyleTouchpad::setAnchor()