diff --git a/src/Mod/TechDraw/App/DrawViewDimension.cpp b/src/Mod/TechDraw/App/DrawViewDimension.cpp
index 4695f63c4e..38ba0440a3 100644
--- a/src/Mod/TechDraw/App/DrawViewDimension.cpp
+++ b/src/Mod/TechDraw/App/DrawViewDimension.cpp
@@ -330,7 +330,7 @@ App::DocumentObjectExecReturn *DrawViewDimension::execute(void)
     return App::DocumentObject::execute();
 }
 
-std::string  DrawViewDimension::getFormatedValue()
+std::string  DrawViewDimension::getFormatedValue(bool obtuse)
 {
     std::string result;
     QString specStr = QString::fromUtf8(FormatSpec.getStrValue().data(),FormatSpec.getStrValue().size());
@@ -340,9 +340,13 @@ std::string  DrawViewDimension::getFormatedValue()
     qVal.setValue(val);
     if (Type.isValue("Angle")) {
         qVal.setUnit(Base::Unit::Angle);
+        if (obtuse) {
+            qVal.setValue(fabs(360.0 - val));
+        }
     } else {
         qVal.setUnit(Base::Unit::Length);
     }
+
     QString userStr = qVal.getUserString();                           //this handles mm to inch/km/parsec etc and decimal positions
                                                                       //but won't give more than Global_Decimals precision
                                                                       //really should be able to ask units for value in appropriate UoM!!
diff --git a/src/Mod/TechDraw/App/DrawViewDimension.h b/src/Mod/TechDraw/App/DrawViewDimension.h
index dea7a36d50..8ccb9e4666 100644
--- a/src/Mod/TechDraw/App/DrawViewDimension.h
+++ b/src/Mod/TechDraw/App/DrawViewDimension.h
@@ -93,7 +93,7 @@ public:
     //return PyObject as DrawViewDimensionPy
     virtual PyObject *getPyObject(void);
 
-    virtual std::string getFormatedValue();
+    virtual std::string getFormatedValue(bool obtuse = false);
     virtual double getDimValue();
     DrawViewPart* getViewPart() const;
     virtual QRectF getRect() const { return QRectF(0,0,1,1);}                   //pretend dimensions always fit!
diff --git a/src/Mod/TechDraw/Gui/QGIViewDimension.cpp b/src/Mod/TechDraw/Gui/QGIViewDimension.cpp
index ec7da5be92..dee4c7ae89 100644
--- a/src/Mod/TechDraw/Gui/QGIViewDimension.cpp
+++ b/src/Mod/TechDraw/Gui/QGIViewDimension.cpp
@@ -259,7 +259,7 @@ void QGIViewDimension::updateView(bool update)
     draw();
 }
 
-void QGIViewDimension::updateDim()
+void QGIViewDimension::updateDim(bool obtuse)
 {
     const auto dim( dynamic_cast<TechDraw::DrawViewDimension *>(getViewObject()) );
     if( dim == nullptr ) {
@@ -270,7 +270,7 @@ void QGIViewDimension::updateDim()
         return;
     }
 
-    QString labelText = QString::fromUtf8(dim->getFormatedValue().data(),dim->getFormatedValue().size());
+    QString labelText = QString::fromUtf8(dim->getFormatedValue(obtuse).data(),dim->getFormatedValue().size());
     QFont font = datumLabel->font();
     font.setPointSizeF(Rez::guiX(vp->Fontsize.getValue()));
     font.setFamily(QString::fromUtf8(vp->Font.getValue()));
@@ -1005,18 +1005,20 @@ void QGIViewDimension::draw()
 
         QRectF arcRect(p0.x - length, p0.y - length, 2. * length, 2. * length);
         path.arcMoveTo(arcRect, endangle * 180 / M_PI);
+        double innerAngle = fabs(endangle - startangle) * 180.0/M_PI;
+        double outerAngle = 360.0 - innerAngle;
         if(isOutside) {
+            updateDim(true);
             if(labelangle > endangle)
             {
-                path.arcTo(arcRect, endangle * 180 / M_PI, (labelangle  - endangle) * 180 / M_PI);  //CCW from endangle
-                path.arcMoveTo(arcRect,startangle * 180 / M_PI);
-                path.arcTo(arcRect, startangle * 180 / M_PI, -10);   //cw10 from start
+                path.arcMoveTo(arcRect, endangle * 180 / M_PI);
+                path.arcTo(arcRect, endangle * 180 / M_PI, - outerAngle);
             } else {
-                path.arcTo(arcRect, endangle * 180 / M_PI, 10); // chosen a nominal value for 10 degrees
-                path.arcMoveTo(arcRect,startangle * 180 / M_PI);
-                path.arcTo(arcRect, startangle * 180 / M_PI, (labelangle - startangle) * 180 / M_PI);   //unknown dir
+                path.arcMoveTo(arcRect, startangle * 180 / M_PI);
+                path.arcTo(arcRect, startangle * 180 / M_PI, outerAngle);  
             }
         } else {
+            updateDim(false);
             path.arcTo(arcRect, endangle * 180 / M_PI, -range * 180 / M_PI);
         }
 
diff --git a/src/Mod/TechDraw/Gui/QGIViewDimension.h b/src/Mod/TechDraw/Gui/QGIViewDimension.h
index dbcc5ce5fd..d5a2938e71 100644
--- a/src/Mod/TechDraw/Gui/QGIViewDimension.h
+++ b/src/Mod/TechDraw/Gui/QGIViewDimension.h
@@ -108,7 +108,7 @@ public Q_SLOTS:
     void datumLabelDragFinished(void);
     void select(bool state);
     void hover(bool state);
-    void updateDim(void);
+    void updateDim(bool obtuse = false);
 
 protected:
     void draw() override;