diff --git a/src/khoj/interface/desktop/main_window.py b/src/khoj/interface/desktop/main_window.py
index aa4c9639..3f827a0f 100644
--- a/src/khoj/interface/desktop/main_window.py
+++ b/src/khoj/interface/desktop/main_window.py
@@ -11,8 +11,8 @@ from PySide6.QtCore import QThread
 
 
 class ServerThread(QThread):
-    def __init__(self, start_server_func):
-        super(ServerThread, self).__init__()
+    def __init__(self, start_server_func, parent=None):
+        super(ServerThread, self).__init__(parent)
         self.start_server_func = start_server_func
 
     def __del__(self):
diff --git a/src/khoj/main.py b/src/khoj/main.py
index 751f75e9..cb633bba 100644
--- a/src/khoj/main.py
+++ b/src/khoj/main.py
@@ -100,7 +100,7 @@ def run():
         # Setup Server
         initialize_server(args.config, args.regenerate, required=False)
         configure_routes(app)
-        server = ServerThread(start_server_func=lambda: start_server(app, host=args.host, port=args.port))
+        server = ServerThread(start_server_func=lambda: start_server(app, host=args.host, port=args.port), parent=gui)
 
         url = f"http://{args.host}:{args.port}"
         logger.info(f"🌗 Khoj is running at {url}")