diff --git a/src/bitmessageqt/__init__.py b/src/bitmessageqt/__init__.py
index 744750ee..9de23406 100644
--- a/src/bitmessageqt/__init__.py
+++ b/src/bitmessageqt/__init__.py
@@ -2441,6 +2441,8 @@ class MyForm(settingsmixin.SMainWindow):
                 self.settingsDialogInstance.ui.checkBoxStartOnLogon.isChecked()))
             shared.config.set('bitmessagesettings', 'minimizetotray', str(
                 self.settingsDialogInstance.ui.checkBoxMinimizeToTray.isChecked()))
+            shared.config.set('bitmessagesettings', 'trayonclose', str(
+                self.settingsDialogInstance.ui.checkBoxTrayOnClose.isChecked()))
             shared.config.set('bitmessagesettings', 'showtraynotifications', str(
                 self.settingsDialogInstance.ui.checkBoxShowTrayNotifications.isChecked()))
             shared.config.set('bitmessagesettings', 'startintray', str(
@@ -2851,15 +2853,15 @@ class MyForm(settingsmixin.SMainWindow):
     # window close event
     def closeEvent(self, event):
         self.appIndicatorHide()
-        minimizeonclose = False
+        trayonclose = False
 
         try:
-            minimizeonclose = shared.config.getboolean(
-                'bitmessagesettings', 'minimizeonclose')
+            trayonclose = shared.config.getboolean(
+                'bitmessagesettings', 'trayonclose')
         except Exception:
             pass
 
-        if minimizeonclose:
+        if trayonclose:
             # minimize the application
             event.ignore()
         else:
@@ -4070,6 +4072,8 @@ class settingsDialog(QtGui.QDialog):
             shared.config.getboolean('bitmessagesettings', 'startonlogon'))
         self.ui.checkBoxMinimizeToTray.setChecked(
             shared.config.getboolean('bitmessagesettings', 'minimizetotray'))
+        self.ui.checkBoxTrayOnClose.setChecked(
+            shared.safeConfigGetBoolean('bitmessagesettings', 'trayonclose'))
         self.ui.checkBoxShowTrayNotifications.setChecked(
             shared.config.getboolean('bitmessagesettings', 'showtraynotifications'))
         self.ui.checkBoxStartInTray.setChecked(
diff --git a/src/bitmessageqt/settings.py b/src/bitmessageqt/settings.py
index efdfc1b7..e6fbbc66 100644
--- a/src/bitmessageqt/settings.py
+++ b/src/bitmessageqt/settings.py
@@ -44,13 +44,22 @@ class Ui_settingsDialog(object):
         self.checkBoxStartOnLogon = QtGui.QCheckBox(self.tabUserInterface)
         self.checkBoxStartOnLogon.setObjectName(_fromUtf8("checkBoxStartOnLogon"))
         self.formLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.checkBoxStartOnLogon)
-        self.checkBoxStartInTray = QtGui.QCheckBox(self.tabUserInterface)
+        self.groupBoxTray = QtGui.QGroupBox(self.tabUserInterface)
+        self.groupBoxTray.setObjectName(_fromUtf8("groupBoxTray"))
+        self.formLayoutTray = QtGui.QFormLayout(self.groupBoxTray)
+        self.formLayoutTray.setObjectName(_fromUtf8("formLayoutTray"))
+        self.checkBoxStartInTray = QtGui.QCheckBox(self.groupBoxTray)
         self.checkBoxStartInTray.setObjectName(_fromUtf8("checkBoxStartInTray"))
-        self.formLayout.setWidget(1, QtGui.QFormLayout.SpanningRole, self.checkBoxStartInTray)
-        self.checkBoxMinimizeToTray = QtGui.QCheckBox(self.tabUserInterface)
+        self.formLayoutTray.setWidget(0, QtGui.QFormLayout.SpanningRole, self.checkBoxStartInTray)
+        self.checkBoxMinimizeToTray = QtGui.QCheckBox(self.groupBoxTray)
         self.checkBoxMinimizeToTray.setChecked(True)
         self.checkBoxMinimizeToTray.setObjectName(_fromUtf8("checkBoxMinimizeToTray"))
-        self.formLayout.setWidget(2, QtGui.QFormLayout.LabelRole, self.checkBoxMinimizeToTray)
+        self.formLayoutTray.setWidget(1, QtGui.QFormLayout.LabelRole, self.checkBoxMinimizeToTray)
+        self.checkBoxTrayOnClose = QtGui.QCheckBox(self.groupBoxTray)
+        self.checkBoxTrayOnClose.setChecked(True)
+        self.checkBoxTrayOnClose.setObjectName(_fromUtf8("checkBoxTrayOnClose"))
+        self.formLayoutTray.setWidget(2, QtGui.QFormLayout.LabelRole, self.checkBoxTrayOnClose)
+        self.formLayout.setWidget(1, QtGui.QFormLayout.SpanningRole, self.groupBoxTray)
         self.checkBoxShowTrayNotifications = QtGui.QCheckBox(self.tabUserInterface)
         self.checkBoxShowTrayNotifications.setObjectName(_fromUtf8("checkBoxShowTrayNotifications"))
         self.formLayout.setWidget(3, QtGui.QFormLayout.LabelRole, self.checkBoxShowTrayNotifications)
@@ -446,8 +455,10 @@ class Ui_settingsDialog(object):
     def retranslateUi(self, settingsDialog):
         settingsDialog.setWindowTitle(_translate("settingsDialog", "Settings", None))
         self.checkBoxStartOnLogon.setText(_translate("settingsDialog", "Start Bitmessage on user login", None))
+        self.groupBoxTray.setTitle(_translate("settingsDialog", "Tray", None))
         self.checkBoxStartInTray.setText(_translate("settingsDialog", "Start Bitmessage in the tray (don\'t show main window)", None))
         self.checkBoxMinimizeToTray.setText(_translate("settingsDialog", "Minimize to tray", None))
+        self.checkBoxTrayOnClose.setText(_translate("settingsDialog", "Close to tray", None))
         self.checkBoxShowTrayNotifications.setText(_translate("settingsDialog", "Show notification when message received", None))
         self.checkBoxPortableMode.setText(_translate("settingsDialog", "Run in Portable Mode", None))
         self.PortableModeDescription.setText(_translate("settingsDialog", "In Portable Mode, messages and config files are stored in the same directory as the program rather than the normal application-data folder. This makes it convenient to run Bitmessage from a USB thumb drive.", None))