diff --git a/src/gui/SettingsWidget.cpp b/src/gui/SettingsWidget.cpp
index 498eb0694..9edee6242 100644
--- a/src/gui/SettingsWidget.cpp
+++ b/src/gui/SettingsWidget.cpp
@@ -73,7 +73,7 @@ SettingsWidget::SettingsWidget(QWidget* parent)
     connect(m_generalUi->autoSaveAfterEveryChangeCheckBox, SIGNAL(toggled(bool)),
             this, SLOT(enableAutoSaveOnExit(bool)));
     connect(m_generalUi->systrayShowCheckBox, SIGNAL(toggled(bool)),
-            m_generalUi->systrayMinimizeToTrayCheckBox, SLOT(setEnabled(bool)));
+            this, SLOT(enableSystrayMinimizeToTray(bool)));
     connect(m_generalUi->systrayMinimizeToTrayCheckBox, SIGNAL(toggled(bool)),
             m_generalUi->systrayMinimizeOnCloseCheckBox, SLOT(setEnabled(bool)));
 
@@ -201,3 +201,10 @@ void SettingsWidget::enableAutoSaveOnExit(bool checked)
 {
     m_generalUi->autoSaveOnExitCheckBox->setEnabled(!checked);
 }
+
+void SettingsWidget::enableSystrayMinimizeToTray(bool checked)
+{
+    m_generalUi->systrayMinimizeToTrayCheckBox->setEnabled(checked);
+    bool checked2 = m_generalUi->systrayMinimizeToTrayCheckBox->checkState();
+    m_generalUi->systrayMinimizeOnCloseCheckBox->setEnabled(checked && checked2);
+}
diff --git a/src/gui/SettingsWidget.h b/src/gui/SettingsWidget.h
index a53fd30b7..5ad572fed 100644
--- a/src/gui/SettingsWidget.h
+++ b/src/gui/SettingsWidget.h
@@ -51,6 +51,7 @@ private Q_SLOTS:
     void saveSettings();
     void reject();
     void enableAutoSaveOnExit(bool checked);
+    void enableSystrayMinimizeToTray(bool checked);
 
 private:
     QWidget* const m_secWidget;
diff --git a/src/gui/SettingsWidgetGeneral.ui b/src/gui/SettingsWidgetGeneral.ui
index 3f6c7e4b1..8b68fba7b 100644
--- a/src/gui/SettingsWidgetGeneral.ui
+++ b/src/gui/SettingsWidgetGeneral.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>456</width>
-    <height>346</height>
+    <width>684</width>
+    <height>394</height>
    </rect>
   </property>
   <layout class="QFormLayout" name="formLayout">
@@ -104,24 +104,73 @@
     </widget>
    </item>
    <item row="11" column="0">
-    <widget class="QCheckBox" name="systrayMinimizeToTrayCheckBox">
-     <property name="enabled">
-      <bool>false</bool>
+    <layout class="QHBoxLayout" name="systrayLayout">
+     <property name="sizeConstraint">
+      <enum>QLayout::SetMaximumSize</enum>
      </property>
-     <property name="text">
-      <string>Hide window to system tray when minimized</string>
-     </property>
-    </widget>
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>20</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QCheckBox" name="systrayMinimizeToTrayCheckBox">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string>Hide window to system tray when minimized</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
    <item row="12" column="0">
-    <widget class="QCheckBox" name="systrayMinimizeOnCloseCheckBox">
-     <property name="enabled">
-      <bool>false</bool>
+    <layout class="QHBoxLayout" name="systray2Layout">
+     <property name="sizeConstraint">
+      <enum>QLayout::SetMaximumSize</enum>
      </property>
-     <property name="text">
-      <string>Hide window to system tray instead of App Exit</string>
-     </property>
-    </widget>
+     <item>
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QCheckBox" name="systrayMinimizeOnCloseCheckBox">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="text">
+        <string>Hide window to system tray instead of App Exit</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
   </layout>
  </widget>