diff --git a/src/Mod/Draft/DraftGui.py b/src/Mod/Draft/DraftGui.py
index b59bf0333b..73a180a83d 100644
--- a/src/Mod/Draft/DraftGui.py
+++ b/src/Mod/Draft/DraftGui.py
@@ -950,7 +950,6 @@ class DraftToolBar:
         self.extraLineUi()
         self.xValue.setEnabled(True)
         self.yValue.setEnabled(True)
-        self.undoButton.show()
         self.continueCmd.show()
 
     def wireUi(self, title=translate("draft", "DWire"), cancel=None, extra=None,
@@ -972,16 +971,13 @@ class DraftToolBar:
 
     def circleUi(self):
         self.pointUi(translate("draft", "Circle"),icon="Draft_Circle")
-        if Draft.getParam("UsePartPrimitives",False):
-            self.hasFill.setEnabled(False)
-        else:
-            self.hasFill.setEnabled(True)
-        self.hasFill.show()
-        self.continueCmd.show()
+        self.extUi()
+        self.isRelative.hide()
 
     def arcUi(self):
         self.pointUi(translate("draft", "Arc"),icon="Draft_Arc")
         self.continueCmd.show()
+        self.isRelative.hide()
 
     def rotateSetCenterUi(self):
         self.pointUi(translate("draft", "Rotate"),icon="Draft_Rotate")
@@ -1122,6 +1118,8 @@ class DraftToolBar:
         self.textbuffer=[]
         self.textline=0
         self.continueCmd.show()
+        # Change the checkbox label as the in-command shortcut cannot be used:
+        self.continueCmd.setText(translate("draft", "Continue"))
 
     def SSUi(self):
         ''' set up ui for ShapeString text entry '''
@@ -1234,7 +1232,6 @@ class DraftToolBar:
         self.continueCmd.show()
 
     def modUi(self):
-        self.undoButton.hide()
         self.isCopy.show()
         self.isSubelementMode.show()
         p = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Draft")
diff --git a/src/Mod/Draft/draftguitools/gui_edit.py b/src/Mod/Draft/draftguitools/gui_edit.py
index 55fa0f8bac..c80ebbcbf2 100644
--- a/src/Mod/Draft/draftguitools/gui_edit.py
+++ b/src/Mod/Draft/draftguitools/gui_edit.py
@@ -116,7 +116,6 @@ class Edit(gui_base_original.Modifier):
     3 - when in editing, lineUi support clicking destination point
         by self.startEditing
         self.ui.lineUi()
-        self.ui.isRelative.show()
 
     Tracker selection
     -----------------
@@ -505,7 +504,6 @@ class Edit(gui_base_original.Modifier):
                                  + str(node_idx) + "\n")
 
         self.ui.lineUi()
-        self.ui.isRelative.show()
         self.editing = node_idx
         self.trackers[obj.Name][node_idx].off()
 
diff --git a/src/Mod/Draft/draftguitools/gui_points.py b/src/Mod/Draft/draftguitools/gui_points.py
index ce95f2974e..07acd8f7e8 100644
--- a/src/Mod/Draft/draftguitools/gui_points.py
+++ b/src/Mod/Draft/draftguitools/gui_points.py
@@ -75,6 +75,7 @@ class Point(gui_base_original.Creator):
         self.point = None
         if self.ui:
             self.ui.pointUi(title=translate("draft", self.featureName), icon="Draft_Point")
+            self.ui.isRelative.hide()
             self.ui.continueCmd.show()
         # adding 2 callback functions
         self.callbackClick = self.view.addEventCallbackPivy(coin.SoMouseButtonEvent.getClassTypeId(), self.click)
diff --git a/src/Mod/Draft/draftguitools/gui_polygons.py b/src/Mod/Draft/draftguitools/gui_polygons.py
index 20589b88a6..ccfdd4ee3e 100644
--- a/src/Mod/Draft/draftguitools/gui_polygons.py
+++ b/src/Mod/Draft/draftguitools/gui_polygons.py
@@ -68,6 +68,7 @@ class Polygon(gui_base_original.Creator):
             self.tanpoints = []
             self.ui.pointUi(title=translate("draft", self.featureName), icon="Draft_Polygon")
             self.ui.extUi()
+            self.ui.isRelative.hide()
             self.ui.numFaces.show()
             self.ui.numFacesLabel.show()
             self.altdown = False
diff --git a/src/Mod/Draft/draftguitools/gui_texts.py b/src/Mod/Draft/draftguitools/gui_texts.py
index e29a781cb2..5fdbb3e162 100644
--- a/src/Mod/Draft/draftguitools/gui_texts.py
+++ b/src/Mod/Draft/draftguitools/gui_texts.py
@@ -68,6 +68,8 @@ class Text(gui_base_original.Creator):
             self.text = ''
             self.ui.sourceCmd = self
             self.ui.pointUi(title=translate("draft", self.featureName), icon="Draft_Text")
+            self.ui.isRelative.hide()
+            self.ui.continueCmd.show()
             self.call = self.view.addEventCallback("SoEvent", self.action)
             self.active = True
             self.ui.xValue.setFocus()