diff --git a/src/lib/gui/dialogs/SettingsDialog.ui b/src/lib/gui/dialogs/SettingsDialog.ui
index 559ee5ad2..7fef9cd87 100644
--- a/src/lib/gui/dialogs/SettingsDialog.ui
+++ b/src/lib/gui/dialogs/SettingsDialog.ui
@@ -22,9 +22,6 @@
    </property>
    <item>
     <widget class="QTabWidget" name="tabWidget">
-     <property name="currentIndex">
-      <number>0</number>
-     </property>
      <widget class="QWidget" name="tabGeneral">
       <property name="sizePolicy">
        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -91,20 +88,6 @@
          </property>
         </widget>
        </item>
-       <item>
-        <widget class="QCheckBox" name="cbShowVersion">
-         <property name="text">
-          <string>Include version in the window title</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QCheckBox" name="cbAutoHide">
-         <property name="text">
-          <string>Hide the window when the app starts</string>
-         </property>
-        </widget>
-       </item>
        <item>
         <widget class="QCheckBox" name="cbPreventSleep">
          <property name="text">
@@ -112,13 +95,6 @@
          </property>
         </widget>
        </item>
-       <item>
-        <widget class="QCheckBox" name="cbCloseToTray">
-         <property name="text">
-          <string>Leave app running in notification area when the window is closed</string>
-         </property>
-        </widget>
-       </item>
        <item>
         <layout class="QFormLayout" name="formLayout">
          <item row="1" column="1">
@@ -159,6 +135,75 @@
        </item>
       </layout>
      </widget>
+     <widget class="QWidget" name="tabWindow">
+      <attribute name="title">
+       <string>&amp;Window</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_2">
+       <property name="spacing">
+        <number>9</number>
+       </property>
+       <property name="leftMargin">
+        <number>12</number>
+       </property>
+       <property name="topMargin">
+        <number>20</number>
+       </property>
+       <property name="rightMargin">
+        <number>12</number>
+       </property>
+       <property name="bottomMargin">
+        <number>20</number>
+       </property>
+       <item>
+        <spacer name="verticalSpacer_10">
+         <property name="orientation">
+          <enum>Qt::Orientation::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>0</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QCheckBox" name="cbAutoHide">
+         <property name="text">
+          <string>Hide the window when the app starts</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QCheckBox" name="cbCloseToTray">
+         <property name="text">
+          <string>Leave app running in notification area when the window is closed</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QCheckBox" name="cbShowVersion">
+         <property name="text">
+          <string>Include version in the window title</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="verticalSpacer_11">
+         <property name="orientation">
+          <enum>Qt::Orientation::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>0</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
      <widget class="QWidget" name="tabLog">
       <attribute name="title">
        <string>&amp;Logs</string>
diff --git a/translations/deskflow_es.ts b/translations/deskflow_es.ts
index 52b9c91fc..d8f6b576c 100644
--- a/translations/deskflow_es.ts
+++ b/translations/deskflow_es.ts
@@ -1293,6 +1293,10 @@ Al habilitar esta opción, se deshabilitará la interfaz gráfica de usuario (GU
         <source>&amp;Network</source>
         <translation>R&amp;ed</translation>
     </message>
+    <message>
+        <source>&amp;Window</source>
+        <translation type="unfinished">&amp;Ventana</translation>
+    </message>
 </context>
 <context>
     <name>StatusBar</name>
diff --git a/translations/deskflow_it.ts b/translations/deskflow_it.ts
index 8e27a7676..51e959f71 100644
--- a/translations/deskflow_it.ts
+++ b/translations/deskflow_it.ts
@@ -1293,6 +1293,10 @@ L&apos;abilitazione di questa impostazione disabiliterà l&apos;interfaccia graf
         <source>&amp;Network</source>
         <translation>&amp;Rete</translation>
     </message>
+    <message>
+        <source>&amp;Window</source>
+        <translation type="unfinished">&amp;Finestra</translation>
+    </message>
 </context>
 <context>
     <name>StatusBar</name>
diff --git a/translations/deskflow_ja.ts b/translations/deskflow_ja.ts
index 2c56f369b..b83cf4ff9 100644
--- a/translations/deskflow_ja.ts
+++ b/translations/deskflow_ja.ts
@@ -1295,6 +1295,10 @@ Enabling this setting will disable the server config GUI.</source>
         <source>&amp;Network</source>
         <translation>ネットワーク(&amp;N)</translation>
     </message>
+    <message>
+        <source>&amp;Window</source>
+        <translation type="unfinished">ウィンドウ(&amp;W)</translation>
+    </message>
 </context>
 <context>
     <name>StatusBar</name>
diff --git a/translations/deskflow_ko.ts b/translations/deskflow_ko.ts
index 69ca888b6..0e89154e9 100644
--- a/translations/deskflow_ko.ts
+++ b/translations/deskflow_ko.ts
@@ -1293,6 +1293,10 @@ Enabling this setting will disable the server config GUI.</source>
         <source>&amp;Network</source>
         <translation>네트워크(&amp;N)</translation>
     </message>
+    <message>
+        <source>&amp;Window</source>
+        <translation type="unfinished">창문(&amp;W)</translation>
+    </message>
 </context>
 <context>
     <name>StatusBar</name>
diff --git a/translations/deskflow_ru.ts b/translations/deskflow_ru.ts
index 760ceaa0d..357ef948a 100644
--- a/translations/deskflow_ru.ts
+++ b/translations/deskflow_ru.ts
@@ -1291,6 +1291,10 @@ Enabling this setting will disable the server config GUI.</source>
         <source>&amp;Network</source>
         <translation>&amp;Сеть</translation>
     </message>
+    <message>
+        <source>&amp;Window</source>
+        <translation type="unfinished">&amp;Окно</translation>
+    </message>
 </context>
 <context>
     <name>StatusBar</name>
diff --git a/translations/deskflow_zh_CN.ts b/translations/deskflow_zh_CN.ts
index d57510e0a..6d1aa2320 100644
--- a/translations/deskflow_zh_CN.ts
+++ b/translations/deskflow_zh_CN.ts
@@ -1295,6 +1295,10 @@ Enabling this setting will disable the server config GUI.</source>
         <source>&amp;Network</source>
         <translation>网络(&amp;N)</translation>
     </message>
+    <message>
+        <source>&amp;Window</source>
+        <translation type="unfinished">窗户(&amp;W)</translation>
+    </message>
 </context>
 <context>
     <name>StatusBar</name>