diff --git a/src/Gui/EditableDatumLabel.cpp b/src/Gui/EditableDatumLabel.cpp
index f005745d46..4cab14416f 100644
--- a/src/Gui/EditableDatumLabel.cpp
+++ b/src/Gui/EditableDatumLabel.cpp
@@ -239,6 +239,10 @@ void EditableDatumLabel::positionSpinbox()
         return;
     }
 
+    if (spinBox->hasFocus()) {
+        spinBox->raise();
+    }
+
     QSize wSize = spinBox->size();
     QSize vSize = viewer->size();
     QPoint pxCoord = viewer->toQPoint(viewer->getPointOnViewport(getTextCenterPoint()));