--- a/eric6/Preferences/ConfigurationPages/EditorGeneralPage.ui	Sat Jan 23 12:10:31 2021 +0100
+++ b/eric6/Preferences/ConfigurationPages/EditorGeneralPage.ui	Sat Jan 23 12:52:18 2021 +0100
@@ -394,15 +394,15 @@
      <property name="title">
       <string>Docstring</string>
      </property>
-     <layout class="QHBoxLayout" name="horizontalLayout_2">
-      <item>
+     <layout class="QGridLayout" name="gridLayout_6">
+      <item row="0" column="0">
        <widget class="QLabel" name="label_4">
         <property name="text">
          <string>Docstring Style:</string>
         </property>
        </widget>
       </item>
-      <item>
+      <item row="0" column="1">
        <widget class="QComboBox" name="docstringStyleComboBox">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -415,6 +415,16 @@
         </property>
        </widget>
       </item>
+      <item row="1" column="0" colspan="2">
+       <widget class="QCheckBox" name="docstringCompletionCheckBox">
+        <property name="toolTip">
+         <string>Select this to generate a docstring when the docstring start sequence was entered (e.g. &quot;&quot;&quot; for Python).</string>
+        </property>
+        <property name="text">
+         <string>Generate Docstring when Docstring start is entered</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
@@ -476,6 +486,7 @@
   <tabstop>sourceOutlineShowCodingCheckBox</tabstop>
   <tabstop>comment0CheckBox</tabstop>
   <tabstop>docstringStyleComboBox</tabstop>
+  <tabstop>docstringCompletionCheckBox</tabstop>
   <tabstop>vsSelectionCheckBox</tabstop>
   <tabstop>vsUserCheckBox</tabstop>
  </tabstops>