diff --git a/src/Mod/TechDraw/Gui/TaskCosVertex.cpp b/src/Mod/TechDraw/Gui/TaskCosVertex.cpp
index 01ed5d86b6..e32778e586 100644
--- a/src/Mod/TechDraw/Gui/TaskCosVertex.cpp
+++ b/src/Mod/TechDraw/Gui/TaskCosVertex.cpp
@@ -30,6 +30,8 @@
 
 #include <Base/Console.h>
 #include <Base/Tools.h>
+#include <Base/Quantity.h>
+#include <Base/UnitsApi.h>
 
 #include <Gui/Application.h>
 #include <Gui/BitmapFactory.h>
@@ -130,9 +132,13 @@ void TaskCosVertex::setUiPrimary()
     }
     ui->pbTracker->setText(QString::fromUtf8("Point Picker"));
     ui->pbTracker->setEnabled(true);
-    ui->qsbX->setEnabled(true);
-    ui->qsbY->setEnabled(true);
-    ui->qsbZ->setEnabled(false);
+    ui->dsbX->setEnabled(true);
+    ui->dsbY->setEnabled(true);
+    ui->dsbZ->setEnabled(false);
+    int decimals = Base::UnitsApi::getDecimals();
+    ui->dsbX->setDecimals(decimals);
+    ui->dsbY->setDecimals(decimals);
+    ui->dsbZ->setDecimals(decimals);
 }
 
 void TaskCosVertex::updateUi(void)
@@ -140,9 +146,9 @@ void TaskCosVertex::updateUi(void)
     double x = m_savePoint.x();
     double y = - m_savePoint.y();
     double z = 0.0;
-    ui->qsbX->setValue(x);
-    ui->qsbY->setValue(y);
-    ui->qsbZ->setValue(z);
+    ui->dsbX->setValue(x);
+    ui->dsbY->setValue(y);
+    ui->dsbZ->setValue(z);
 }
 
 void TaskCosVertex::addCosVertex(QPointF qPos)
@@ -300,9 +306,9 @@ bool TaskCosVertex::accept()
     if (pointFromTracker) {
         addCosVertex(m_savePoint);
     } else {
-        double x = ui->qsbX->rawValue();
-        double y = ui->qsbY->rawValue();
-//        double z = ui->qsbZ->rawValue();
+        double x = ui->dsbX->value();
+        double y = ui->dsbY->value();
+//        double z = ui->dsbZ->value();
         QPointF uiPoint(x,-y);
         addCosVertex(uiPoint);
     }
@@ -320,10 +326,11 @@ bool TaskCosVertex::reject()
     Gui::Document* doc = Gui::Application::Instance->getDocument(m_basePage->getDocument());
     if (!doc) return false;
 
+    removeTracker();
+    m_trackerMode = QGTracker::TrackerMode::None;
     if (m_mdi != nullptr) {
         m_mdi->setContextMenuPolicy(m_saveContextPolicy);
     }
-    m_trackerMode = QGTracker::TrackerMode::None;
 
     //make sure any dangling objects are cleaned up 
     Gui::Command::doCommand(Gui::Command::Gui,"App.activeDocument().recompute()");
diff --git a/src/Mod/TechDraw/Gui/TaskCosVertex.ui b/src/Mod/TechDraw/Gui/TaskCosVertex.ui
index 0c7efcae63..9e01e5674f 100644
--- a/src/Mod/TechDraw/Gui/TaskCosVertex.ui
+++ b/src/Mod/TechDraw/Gui/TaskCosVertex.ui
@@ -38,6 +38,18 @@
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
+     <property name="minimumSize">
+      <size>
+       <width>300</width>
+       <height>300</height>
+      </size>
+     </property>
+     <property name="baseSize">
+      <size>
+       <width>300</width>
+       <height>300</height>
+      </size>
+     </property>
      <property name="frameShape">
       <enum>QFrame::Box</enum>
      </property>
@@ -127,13 +139,6 @@
             </property>
            </widget>
           </item>
-          <item row="0" column="2">
-           <widget class="Gui::QuantitySpinBox" name="qsbX">
-            <property name="unit" stdset="0">
-             <string notr="true"/>
-            </property>
-           </widget>
-          </item>
           <item row="0" column="1">
            <spacer name="horizontalSpacer_3">
             <property name="orientation">
@@ -147,13 +152,6 @@
             </property>
            </spacer>
           </item>
-          <item row="1" column="2">
-           <widget class="Gui::QuantitySpinBox" name="qsbY">
-            <property name="unit" stdset="0">
-             <string notr="true"/>
-            </property>
-           </widget>
-          </item>
           <item row="2" column="0">
            <widget class="QLabel" name="label">
             <property name="text">
@@ -168,10 +166,42 @@
             </property>
            </widget>
           </item>
+          <item row="0" column="2">
+           <widget class="QDoubleSpinBox" name="dsbX">
+            <property name="decimals">
+             <number>4</number>
+            </property>
+            <property name="minimum">
+             <double>-2147483647.000000000000000</double>
+            </property>
+            <property name="maximum">
+             <double>2147483647.000000000000000</double>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="2">
+           <widget class="QDoubleSpinBox" name="dsbY">
+            <property name="decimals">
+             <number>4</number>
+            </property>
+            <property name="minimum">
+             <double>-2147483647.000000000000000</double>
+            </property>
+            <property name="maximum">
+             <double>2147483647.000000000000000</double>
+            </property>
+           </widget>
+          </item>
           <item row="2" column="2">
-           <widget class="Gui::QuantitySpinBox" name="qsbZ">
-            <property name="unit" stdset="0">
-             <string notr="true"/>
+           <widget class="QDoubleSpinBox" name="dsbZ">
+            <property name="decimals">
+             <number>4</number>
+            </property>
+            <property name="minimum">
+             <double>-2147483647.000000000000000</double>
+            </property>
+            <property name="maximum">
+             <double>2147483647.000000000000000</double>
             </property>
            </widget>
           </item>
@@ -197,13 +227,6 @@
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>Gui::QuantitySpinBox</class>
-   <extends>QWidget</extends>
-   <header>Gui/QuantitySpinBox.h</header>
-  </customwidget>
- </customwidgets>
  <resources>
   <include location="Resources/TechDraw.qrc"/>
  </resources>