diff --git a/wingetui/__init__.py b/wingetui/__init__.py
index 46c181d4f..9d65b3997 100644
--- a/wingetui/__init__.py
+++ b/wingetui/__init__.py
@@ -1461,7 +1461,9 @@ def updateIfPossible(self):
         border-radius: 4px;
     }}           
     """
-
+    if "--daemon" in sys.argv:
+        if getSettings("DisablesystemTray"):
+            sys.exit(0)
     a = MainApplication()
     a.exec()
     a.running = False
diff --git a/wingetui/storeEngine.py b/wingetui/storeEngine.py
index 48ce8f90b..4c534674f 100644
--- a/wingetui/storeEngine.py
+++ b/wingetui/storeEngine.py
@@ -1154,7 +1154,7 @@ def __init__(self, parent = None):
         updateCheckBox.setChecked(not getSettings("DisableAutoUpdateWingetUI"))
         updateCheckBox.clicked.connect(lambda v: setSettings("DisableAutoUpdateWingetUI", not bool(v)))
         self.layout.addWidget(updateCheckBox)
-        doCloseWingetUI = QCheckBox("Minimze WingetUI to the system tray instead of closing it")
+        doCloseWingetUI = QCheckBox("Keep WingetUI always running on the system tray")
         doCloseWingetUI.setChecked(not getSettings("DisablesystemTray"))
         doCloseWingetUI.clicked.connect(lambda v: setSettings("DisablesystemTray", not bool(v)))
         self.layout.addWidget(doCloseWingetUI)