diff --git a/src/Gui/ViewProviderGeometryObject.cpp b/src/Gui/ViewProviderGeometryObject.cpp
index 192d685e45f6..a4394338cd57 100644
--- a/src/Gui/ViewProviderGeometryObject.cpp
+++ b/src/Gui/ViewProviderGeometryObject.cpp
@@ -291,7 +291,10 @@ void ViewProviderGeometryObject::unsetEdit(int ModNum)
     SoCenterballManip * manip = static_cast<SoCenterballManip*>(path->getTail());
     SoNodeSensor* sensor = reinterpret_cast<SoNodeSensor*>(manip->getUserData());
     // #0000939: Pressing Escape while pivoting a box crashes
-    manip->getDragger()->grabEventsCleanup();
+    // #0000942: Crash when 2xdouble-click on part
+    SoDragger* dragger = manip->getDragger();
+    if (dragger && dragger->getHandleEventAction())
+        dragger->grabEventsCleanup();
 
     // detach sensor
     sensor->detach();