diff --git a/libs/ui/forms/wdggeneralsettings.ui b/libs/ui/forms/wdggeneralsettings.ui
--- a/libs/ui/forms/wdggeneralsettings.ui
+++ b/libs/ui/forms/wdggeneralsettings.ui
@@ -292,13 +292,6 @@
          </property>
         </widget>
        </item>
-       <item row="3" column="0">
-        <widget class="QLabel" name="label_6">
-         <property name="text">
-          <string>Don't show contents when moving sub-windows:</string>
-         </property>
-        </widget>
-       </item>
        <item row="3" column="1">
         <widget class="QCheckBox" name="m_chkRubberBand">
          <property name="sizePolicy">
@@ -308,21 +301,14 @@
           </sizepolicy>
          </property>
          <property name="text">
-          <string/>
-         </property>
-        </widget>
-       </item>
-       <item row="4" column="0">
-        <widget class="QLabel" name="label_7">
-         <property name="text">
-          <string>Show on-canvas popup messages:</string>
+          <string>Don't show contents when moving sub-windows</string>
          </property>
         </widget>
        </item>
        <item row="4" column="1">
         <widget class="QCheckBox" name="m_chkCanvasMessages">
          <property name="text">
-          <string/>
+          <string>Show on-canvas popup messages</string>
          </property>
         </widget>
        </item>
@@ -342,28 +328,14 @@
        <item row="5" column="1">
         <widget class="QCheckBox" name="m_chkHiDPI">
          <property name="text">
-          <string/>
-         </property>
-        </widget>
-       </item>
-       <item row="5" column="0">
-        <widget class="QLabel" name="label_8">
-         <property name="text">
-          <string>Enable Hi-DPI support:</string>
+          <string>Enable Hi-DPI support</string>
          </property>
         </widget>
        </item>
        <item row="6" column="1">
         <widget class="QCheckBox" name="m_chkSingleApplication">
          <property name="text">
-          <string/>
-         </property>
-        </widget>
-       </item>
-       <item row="6" column="0">
-        <widget class="QLabel" name="label_r98">
-         <property name="text">
-          <string>Allow only one instance of Krita:</string>
+          <string>Allow only one instance of Krita</string>
          </property>
         </widget>
        </item>
@@ -551,51 +523,65 @@
         </widget>
        </item>
        <item row="2" column="0">
-        <widget class="QCheckBox" name="m_autosaveCheckBox">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
+        <widget class="QLabel" name="label_13">
          <property name="text">
-          <string>Autosave every:</string>
-         </property>
-         <property name="checked">
-          <bool>true</bool>
+          <string>Autosave:</string>
          </property>
         </widget>
        </item>
        <item row="2" column="1">
-        <widget class="KisIntParseSpinBox" name="m_autosaveSpinBox">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>75</width>
-           <height>0</height>
-          </size>
-         </property>
-         <property name="suffix">
-          <string> min</string>
-         </property>
-         <property name="minimum">
-          <number>1</number>
-         </property>
-         <property name="maximum">
-          <number>1440</number>
-         </property>
-         <property name="singleStep">
-          <number>5</number>
-         </property>
-         <property name="value">
-          <number>15</number>
-         </property>
-        </widget>
+        <layout class="QHBoxLayout" name="horizontalLayout_3">
+         <item>
+          <widget class="QCheckBox" name="m_autosaveCheckBox">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="text">
+            <string comment="Checkbox after “Autosave:”">Enabled</string>
+           </property>
+           <property name="checked">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="KisIntParseSpinBox" name="m_autosaveSpinBox">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize">
+            <size>
+             <width>75</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="suffix">
+            <string comment="Suffix: “Every x min”"> min</string>
+           </property>
+           <property name="prefix">
+            <string comment="Prefix: “Every x min”">Every </string>
+           </property>
+           <property name="minimum">
+            <number>1</number>
+           </property>
+           <property name="maximum">
+            <number>1440</number>
+           </property>
+           <property name="singleStep">
+            <number>5</number>
+           </property>
+           <property name="value">
+            <number>15</number>
+           </property>
+          </widget>
+         </item>
+        </layout>
        </item>
        <item row="3" column="1">
         <widget class="QCheckBox" name="m_chkCompressKra">
@@ -792,5 +778,12 @@
   </customwidget>
  </customwidgets>
  <resources/>
- <connections/>
+ <connections>
+  <connection>
+   <sender>m_autosaveCheckBox</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>m_autosaveSpinBox</receiver>
+   <slot>setEnabled(bool)</slot>
+  </connection>
+ </connections>
 </ui>