diff --git a/src/Mod/Part/Gui/DlgSettingsGeneral.cpp b/src/Mod/Part/Gui/DlgSettingsGeneral.cpp
index 2f2b4a9504..6ab826e391 100644
--- a/src/Mod/Part/Gui/DlgSettingsGeneral.cpp
+++ b/src/Mod/Part/Gui/DlgSettingsGeneral.cpp
@@ -63,6 +63,7 @@ void DlgSettingsGeneral::saveSettings()
     ui->checkObjectNaming->onSave();
     ui->checkAllowCompoundBody->onSave();
     ui->comboDefaultProfileTypeForHole->onSave();
+    ui->checkSwitchToTask->onSave();
 }
 
 void DlgSettingsGeneral::loadSettings()
@@ -73,6 +74,7 @@ void DlgSettingsGeneral::loadSettings()
     ui->checkObjectNaming->onRestore();
     ui->checkAllowCompoundBody->onRestore();
     ui->comboDefaultProfileTypeForHole->onRestore();
+    ui->checkSwitchToTask->onRestore();
 }
 
 /**
diff --git a/src/Mod/Part/Gui/DlgSettingsGeneral.ui b/src/Mod/Part/Gui/DlgSettingsGeneral.ui
index e06db48c68..ee3a26255c 100644
--- a/src/Mod/Part/Gui/DlgSettingsGeneral.ui
+++ b/src/Mod/Part/Gui/DlgSettingsGeneral.ui
@@ -110,40 +110,63 @@
      <property name="title">
       <string>Features settings</string>
      </property>
-     <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <layout class="QVBoxLayout" name="verticalLayout_3">
       <item>
-       <widget class="QLabel" name="label">
-        <property name="text">
-         <string>Default profile type for holes</string>
-        </property>
-       </widget>
+       <layout class="QHBoxLayout" name="horizontalLayout_2">
+        <item>
+         <widget class="QLabel" name="label">
+          <property name="text">
+           <string>Default profile type for holes</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="Gui::PrefComboBox" name="comboDefaultProfileTypeForHole">
+          <property name="currentIndex">
+           <number>1</number>
+          </property>
+          <property name="prefEntry" stdset="0">
+           <cstring>defaultBaseTypeHole</cstring>
+          </property>
+          <property name="prefPath" stdset="0">
+           <cstring>Mod/PartDesign</cstring>
+          </property>
+          <item>
+           <property name="text">
+            <string>Circles and arcs</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Points, circles and arcs</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Points</string>
+           </property>
+          </item>
+         </widget>
+        </item>
+       </layout>
       </item>
       <item>
-       <widget class="Gui::PrefComboBox" name="comboDefaultProfileTypeForHole">
-        <property name="currentIndex">
-         <number>1</number>
+       <widget class="Gui::PrefCheckBox" name="checkSwitchToTask" native="true">
+        <property name="text" stdset="0">
+         <string>Switch to task panel when entering Part Design workbench</string>
+        </property>
+        <property name="toolTip" stdset="0">
+         <string>Automatically switch to the task panel when the Part Design workbench is activated</string>
+        </property>
+        <property name="checked" stdset="0">
+         <bool>true</bool>
         </property>
         <property name="prefEntry" stdset="0">
-         <cstring>defaultBaseTypeHole</cstring>
+         <cstring>SwitchToTask</cstring>
         </property>
         <property name="prefPath" stdset="0">
          <cstring>Mod/PartDesign</cstring>
         </property>
-        <item>
-         <property name="text">
-          <string>Circles and arcs</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>Points, circles and arcs</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>Points</string>
-         </property>
-        </item>
        </widget>
       </item>
      </layout>