diff --git a/src/core/controller.cpp b/src/core/controller.cpp
index 3d2343f9..b0cf0b3d 100644
--- a/src/core/controller.cpp
+++ b/src/core/controller.cpp
@@ -234,6 +234,13 @@ void Controller::enableTrayIcon()
         }
     };
     connect(m_trayIcon, &QSystemTrayIcon::activated, this, trayIconActivated);
+
+#ifdef Q_OS_WIN
+    // Ensure proper removal of tray icon when program quits on Windows.
+    connect(
+      qApp, &QCoreApplication::aboutToQuit, m_trayIcon, &QSystemTrayIcon::hide);
+#endif
+
     m_trayIcon->show();
 }