diff --git a/src/Mod/Image/Gui/ImageOrientationDialog.cpp b/src/Mod/Image/Gui/ImageOrientationDialog.cpp
index f6bfd64dc..10441b32a 100644
--- a/src/Mod/Image/Gui/ImageOrientationDialog.cpp
+++ b/src/Mod/Image/Gui/ImageOrientationDialog.cpp
@@ -30,6 +30,7 @@
 #include <Gui/BitmapFactory.h>
 #include <Gui/MainWindow.h>
 #include <Base/Tools.h>
+#include <Base/UnitsApi.h>
 
 #include "ui_ImageOrientationDialog.h"
 #include "ImageOrientationDialog.h"
@@ -55,7 +56,7 @@ ImageOrientationDialog::~ImageOrientationDialog()
 
 void ImageOrientationDialog::accept()
 {
-    double offset = ui->Offset_doubleSpinBox->value();
+    double offset = ui->Offset_doubleSpinBox->value().getValue();
     bool reverse = ui->Reverse_checkBox->isChecked();
     if (ui->XY_radioButton->isChecked()) {
         if (reverse) {
diff --git a/src/Mod/Image/Gui/ImageOrientationDialog.ui b/src/Mod/Image/Gui/ImageOrientationDialog.ui
index 04d2c5edd..217e51c2e 100644
--- a/src/Mod/Image/Gui/ImageOrientationDialog.ui
+++ b/src/Mod/Image/Gui/ImageOrientationDialog.ui
@@ -83,9 +83,9 @@
       </widget>
      </item>
      <item>
-      <widget class="QDoubleSpinBox" name="Offset_doubleSpinBox">
-       <property name="decimals">
-        <number>1</number>
+      <widget class="Gui::QuantitySpinBox" name="Offset_doubleSpinBox">
+       <property name="unit" stdset="0">
+        <string notr="true">mm</string>
        </property>
        <property name="minimum">
         <double>-999999999.000000000000000</double>
@@ -112,6 +112,13 @@
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>Gui::QuantitySpinBox</class>
+   <extends>QWidget</extends>
+   <header>Gui/QuantitySpinBox.h</header>
+  </customwidget>
+ </customwidgets>
  <resources/>
  <connections>
   <connection>