diff --git a/src/Mod/Part/Gui/DlgExtrusion.cpp b/src/Mod/Part/Gui/DlgExtrusion.cpp
index 632b07bbc..9d196ab12 100644
--- a/src/Mod/Part/Gui/DlgExtrusion.cpp
+++ b/src/Mod/Part/Gui/DlgExtrusion.cpp
@@ -62,7 +62,7 @@ DlgExtrusion::DlgExtrusion(QWidget* parent, Qt::WindowFlags fl)
     ui->dirX->setDecimals(Base::UnitsApi::getDecimals());
     ui->dirY->setDecimals(Base::UnitsApi::getDecimals());
     ui->dirZ->setDecimals(Base::UnitsApi::getDecimals());
-    ui->dirLen->setDecimals(Base::UnitsApi::getDecimals());
+    ui->dirLen->setUnit(Base::Unit::Length);
     ui->taperAngle->setUnit(Base::Unit::Angle);
     ui->dirLen->setMinimumWidth(55); // needed to show all digits
     findShapes();
@@ -179,10 +179,10 @@ void DlgExtrusion::apply()
             label = name;
         }
 
-        double len = ui->dirLen->value();
         double dirX = ui->dirX->value();
         double dirY = ui->dirY->value();
         double dirZ = ui->dirZ->value();
+        double len = ui->dirLen->value().getValue();
         double angle = ui->taperAngle->value().getValue();
         bool makeSolid = ui->makeSolid->isChecked();
 
diff --git a/src/Mod/Part/Gui/DlgExtrusion.ui b/src/Mod/Part/Gui/DlgExtrusion.ui
index a3d6cd300..567b45808 100644
--- a/src/Mod/Part/Gui/DlgExtrusion.ui
+++ b/src/Mod/Part/Gui/DlgExtrusion.ui
@@ -26,7 +26,41 @@
       <string>Direction</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_2">
-      <item row="0" column="0" colspan="2">
+      <item row="1" column="0">
+       <widget class="QCheckBox" name="checkNormal">
+        <property name="text">
+         <string>Along normal</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QPushButton" name="viewButton">
+        <property name="text">
+         <string>3D view</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2">
+       <spacer name="horizontalSpacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>43</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="2" column="0" colspan="3">
+       <widget class="QLabel" name="labelNormal">
+        <property name="text">
+         <string>Note:This option works for planes only</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" colspan="3">
        <layout class="QGridLayout" name="gridLayout">
         <item row="0" column="0">
          <widget class="QLabel" name="label_2">
@@ -120,15 +154,15 @@
          </widget>
         </item>
         <item row="3" column="1">
-         <widget class="QDoubleSpinBox" name="dirLen">
+         <widget class="Gui::QuantitySpinBox" name="dirLen">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
-          <property name="decimals">
-           <number>3</number>
+          <property name="unit" stdset="0">
+           <string notr="true">mm</string>
           </property>
           <property name="minimum">
            <double>0.001000000000000</double>
@@ -143,40 +177,6 @@
         </item>
        </layout>
       </item>
-      <item row="1" column="0">
-       <widget class="QCheckBox" name="checkNormal">
-        <property name="text">
-         <string>Along normal</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QPushButton" name="viewButton">
-        <property name="text">
-         <string>3D view</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="2">
-       <spacer name="horizontalSpacer">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>43</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row="2" column="0" colspan="3">
-       <widget class="QLabel" name="labelNormal">
-        <property name="text">
-         <string>Note:This option works for planes only</string>
-        </property>
-       </widget>
-      </item>
      </layout>
     </widget>
    </item>
@@ -198,6 +198,9 @@
      </item>
      <item>
       <widget class="Gui::QuantitySpinBox" name="taperAngle">
+       <property name="unit" stdset="0">
+        <string notr="true">deg</string>
+       </property>
        <property name="minimum">
         <double>-180.000000000000000</double>
        </property>