diff --git a/qomui/qomui_gui.py b/qomui/qomui_gui.py
index 943489c..3440a6e 100755
--- a/qomui/qomui_gui.py
+++ b/qomui/qomui_gui.py
@@ -79,6 +79,7 @@ class QomuiGui(QtWidgets.QWidget):
                    "firewall",
                    "autoconnect",
                    "minimize",
+                   "minimize_on_close",
                    "ipv6_disable",
                    "alt_dns",
                    "bypass",
@@ -426,6 +427,16 @@ def setupUi(self, Form):
         self.minimizeOptLabel.setIndent(20)
         self.minimizeOptLabel.setFont(italic_font)
         self.verticalLayout_5.addWidget(self.minimizeOptLabel)
+        self.minimize_on_closeOptCheck = QtWidgets.QCheckBox(self.optionsTab)
+        self.minimize_on_closeOptCheck.setFont(bold_font)
+        self.minimize_on_closeOptCheck.setObjectName(_fromUtf8("minimize_on_closeOptCheck"))
+        self.verticalLayout_5.addWidget(self.minimize_on_closeOptCheck)
+        self.minimize_on_closeOptLabel = QtWidgets.QLabel(self.optionsTab)
+        self.minimize_on_closeOptLabel.setObjectName(_fromUtf8("minimize_on_closeOptLabel"))
+        self.minimize_on_closeOptLabel.setWordWrap(True)
+        self.minimize_on_closeOptLabel.setIndent(20)
+        self.minimize_on_closeOptLabel.setFont(italic_font)
+        self.verticalLayout_5.addWidget(self.minimize_on_closeOptLabel)
         self.auto_updateOptCheck = QtWidgets.QCheckBox(self.optionsTab)
         self.auto_updateOptCheck.setObjectName(_fromUtf8("auto_updateOptCheck"))
         self.auto_updateOptCheck.setFont(bold_font)
@@ -854,6 +865,7 @@ def retranslateUi(self, Form):
         self.autoconnectOptCheck.setText(_translate("Form", "Autoconnect/reconnect", None))
         self.auto_updateOptCheck.setText(_translate("Form", "Auto-update", None))
         self.minimizeOptCheck.setText(_translate("Form", "Start minimized", None))
+        self.minimize_on_closeOptCheck.setText(_translate("Form", "Minimize to tray on close", None))
         self.firewallOptCheck.setText(_translate("Form", "Activate Firewall     ", None))
         self.bypassOptCheck.setText(_translate("Form", "Allow OpenVPN bypass", None))
         self.pingOptCheck.setText(_translate("Form", "Perform latency check", None))
@@ -912,7 +924,10 @@ def retranslateUi(self, Form):
                                           "Automatically (re-)connect to last server",
                                           None))
         self.minimizeOptLabel.setText(_translate("Form",
-                                          "Only works if system tray is available",
+                                          "Works only if system tray is available",
+                                          None))
+        self.minimize_on_closeOptLabel.setText(_translate("Form",
+                                          "Works only if system tray is available",
                                           None))
         self.auto_updateOptLabel.setText(_translate("Form",
                                           "Enable automatic updates for supported providers",
@@ -1160,39 +1175,43 @@ def restoreUi(self, reason):
             self.showNormal()
 
     def closeEvent(self, event):
-        self.exit_event = event
-        self.confirm = QtWidgets.QMessageBox()
-        self.timeout = 5
-        self.confirm.setText("Do you really want to quit Qomui?")
-        info = "Closing in {} seconds".format(self.timeout)
-        self.confirm.setInformativeText(info)
-        self.confirm.setIcon(QtWidgets.QMessageBox.Question)
-        self.confirm.addButton(QtWidgets.QPushButton("Exit"), QtWidgets.QMessageBox.YesRole)
-        self.confirm.addButton(QtWidgets.QPushButton("Cancel"), QtWidgets.QMessageBox.NoRole)
-        if self.tray.isSystemTrayAvailable() == True:
-            self.confirm.addButton(QtWidgets.QPushButton("Minimize"), QtWidgets.QMessageBox.RejectRole)
-        self.exit_timer = QtCore.QTimer(self)
-        self.exit_timer.setInterval(1000)
-        self.exit_timer.timeout.connect(self.change_timeout)
-        self.exit_timer.start()
-
-        ret = self.confirm.exec_()
-        self.exit_timer.stop()
+        if self.config_dict["minimize_on_close"] == 1:
+                self.hide()
+        else:
+            self.exit_event = event
+            self.confirm = QtWidgets.QMessageBox()
+            self.timeout = 5
+            self.confirm.setText("Do you really want to quit Qomui?")
+            info = "Closing in {} seconds".format(self.timeout)
+            self.confirm.setInformativeText(info)
+            self.confirm.setIcon(QtWidgets.QMessageBox.Question)
+            self.confirm.addButton(QtWidgets.QPushButton("Exit"), QtWidgets.QMessageBox.YesRole)
+            self.confirm.addButton(QtWidgets.QPushButton("Cancel"), QtWidgets.QMessageBox.NoRole)
+            if self.tray.isSystemTrayAvailable() == True:
+                self.confirm.addButton(QtWidgets.QPushButton("Minimize"), QtWidgets.QMessageBox.RejectRole)
+                
+            self.exit_timer = QtCore.QTimer(self)
+            self.exit_timer.setInterval(1000)
+            self.exit_timer.timeout.connect(self.change_timeout)
+            self.exit_timer.start()
 
-        if ret == 1:
-            self.exit_event.ignore()
+            ret = self.confirm.exec_()
+            self.exit_timer.stop()
 
-        elif ret == 2:
-            self.hide()
+            if ret == 1:
+                self.exit_event.ignore()
 
-        elif ret == 0:
-            self.tray.hide()
-            self.kill()
-            self.disconnect_bypass()
-            self.dbus_call("load_firewall", 2)
-            with open ("{}/server.json".format(HOMEDIR), "w") as s:
-                json.dump(self.server_dict, s)
-            self.exit_event.accept()
+            elif ret == 2:
+                self.hide()
+
+            elif ret == 0:
+                self.tray.hide()
+                self.kill()
+                self.disconnect_bypass()
+                self.dbus_call("load_firewall", 2)
+                with open ("{}/server.json".format(HOMEDIR), "w") as s:
+                    json.dump(self.server_dict, s)
+                self.exit_event.accept()
 
     def change_timeout(self):
         self.timeout -= 1
diff --git a/resources/default_config.json b/resources/default_config.json
index d867f70..e525b7b 100755
--- a/resources/default_config.json
+++ b/resources/default_config.json
@@ -1 +1 @@
-{"alt_dns1": "208.67.222.222", "alt_dns2": "208.67.220.220", "firewall": 0, "autoconnect": 0, "minimize": 0, "ipv6_disable": 0, "alt_dns": 0, "bypass": 0, "ping": 0, "auto_update": 0, "block_lan": 0, "preserve_rules": 0, "fw_gui_only": 0, "log_level": "Info"}
+{"alt_dns1": "208.67.222.222", "alt_dns2": "208.67.220.220", "firewall": 0, "autoconnect": 0, "minimize": 0, "minimize_on_close": 0, "ipv6_disable": 0, "alt_dns": 0, "bypass": 0, "ping": 0, "auto_update": 0, "block_lan": 0, "preserve_rules": 0, "fw_gui_only": 0, "log_level": "Info"}