diff --git a/src/Gui/Inventor/Draggers/Gizmo.cpp b/src/Gui/Inventor/Draggers/Gizmo.cpp
index 82702d03c7..ee29a99b09 100644
--- a/src/Gui/Inventor/Draggers/Gizmo.cpp
+++ b/src/Gui/Inventor/Draggers/Gizmo.cpp
@@ -253,6 +253,9 @@ void LinearGizmo::draggingFinished()
         property->blockSignals(false);
         property->valueChanged(property->value().getValue());
     }
+
+    property->setFocus();
+    property->selectAll();
 }
 
 void LinearGizmo::draggingContinued()
@@ -448,6 +451,9 @@ void RotationGizmo::draggingFinished()
         property->blockSignals(false);
         property->valueChanged(property->value().getValue());
     }
+
+    property->setFocus();
+    property->selectAll();
 }
 
 void RotationGizmo::draggingContinued()