diff --git a/src/Mod/Sketcher/Gui/EditModeGeometryCoinManager.cpp b/src/Mod/Sketcher/Gui/EditModeGeometryCoinManager.cpp
index 982600b8c3..72912cfb53 100644
--- a/src/Mod/Sketcher/Gui/EditModeGeometryCoinManager.cpp
+++ b/src/Mod/Sketcher/Gui/EditModeGeometryCoinManager.cpp
@@ -139,7 +139,9 @@ void EditModeGeometryCoinManager::updateGeometryColor(const GeoListFacade& geoli
             ViewProviderSketchCoinAttorney::getConstraints(viewProvider);
         for (auto& constr : constraints) {
             if (constr->Type == Coincident
-                || (constr->Type == Tangent && constr->FirstPos != Sketcher::PointPos::none)) {
+                || (constr->Type == Tangent && constr->FirstPos != Sketcher::PointPos::none)
+                || (constr->Type == Perpendicular && constr->FirstPos != Sketcher::PointPos::none
+                    && constr->SecondPos != Sketcher::PointPos::none)) {
                 if ((constr->First == GeoId && constr->FirstPos == PosId)
                     || (constr->Second == GeoId && constr->SecondPos == PosId)) {
                     return true;
@@ -301,7 +303,7 @@ void EditModeGeometryCoinManager::updateGeometryColor(const GeoListFacade& geoli
                         z = viewOrientationFactor * drawingParameters.zLowPoints;
                     }
                     else {
-                        if (isExternal) {
+                        if (isExternal || isInternalAlignedGeom(GeoId)) {
                             z = viewOrientationFactor * drawingParameters.zRootPoint;
                         }
                         else if (geom->getConstruction()) {