diff --git a/selfdrive/navd/main.cc b/selfdrive/navd/main.cc
index b6eec10328..8cef07edcf 100644
--- a/selfdrive/navd/main.cc
+++ b/selfdrive/navd/main.cc
@@ -7,22 +7,12 @@
 #include "selfdrive/navd/map_renderer.h"
 #include "system/hardware/hw.h"
 
-
-
-void sigHandler(int s) {
-  qInfo() << "Shutting down";
-  std::signal(s, SIG_DFL);
-
-  qApp->quit();
-}
-
-
 int main(int argc, char *argv[]) {
   qInstallMessageHandler(swagLogMessageHandler);
 
   QApplication app(argc, argv);
-  std::signal(SIGINT, sigHandler);
-  std::signal(SIGTERM, sigHandler);
+  std::signal(SIGINT, sigTermHandler);
+  std::signal(SIGTERM, sigTermHandler);
 
   MapRenderer * m = new MapRenderer(get_mapbox_settings());
   assert(m);
diff --git a/selfdrive/ui/qt/util.h b/selfdrive/ui/qt/util.h
index 5b66ec9fa4..b86bbcf899 100644
--- a/selfdrive/ui/qt/util.h
+++ b/selfdrive/ui/qt/util.h
@@ -17,6 +17,7 @@ QMap<QString, QString> getSupportedLanguages();
 void configFont(QPainter &p, const QString &family, int size, const QString &style);
 void clearLayout(QLayout* layout);
 void setQtSurfaceFormat();
+void sigTermHandler(int s);
 QString timeAgo(const QDateTime &date);
 void swagLogMessageHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg);
 void initApp(int argc, char *argv[], bool disable_hidpi = true);
diff --git a/selfdrive/ui/soundd/main.cc b/selfdrive/ui/soundd/main.cc
index 64088deff8..c6c7434ca4 100644
--- a/selfdrive/ui/soundd/main.cc
+++ b/selfdrive/ui/soundd/main.cc
@@ -5,17 +5,13 @@
 #include "selfdrive/ui/qt/util.h"
 #include "selfdrive/ui/soundd/sound.h"
 
-void sigHandler(int s) {
-  qApp->quit();
-}
-
 int main(int argc, char **argv) {
   qInstallMessageHandler(swagLogMessageHandler);
   setpriority(PRIO_PROCESS, 0, -20);
 
   QApplication a(argc, argv);
-  std::signal(SIGINT, sigHandler);
-  std::signal(SIGTERM, sigHandler);
+  std::signal(SIGINT, sigTermHandler);
+  std::signal(SIGTERM, sigTermHandler);
 
   Sound sound;
   return a.exec();