diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 88c19ec494..98ef907764 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -565,8 +565,9 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) :
 }
 
 void Application::aboutToQuit() {
-    _aboutToQuit = true;
+    emit beforeAboutToQuit();
     
+    _aboutToQuit = true;
     cleanupBeforeQuit();
 }
 
diff --git a/interface/src/Application.h b/interface/src/Application.h
index e9b8deff55..cf047f02d4 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -337,6 +337,8 @@ signals:
 
     void faceURLChanged(const QString& newValue);
     void skeletonURLChanged(const QString& newValue);
+    
+    void beforeAboutToQuit();
 
 public slots:
     void domainChanged(const QString& domainHostname);
diff --git a/interface/src/ui/HMDToolsDialog.cpp b/interface/src/ui/HMDToolsDialog.cpp
index c5b8db06d0..4a899a641e 100644
--- a/interface/src/ui/HMDToolsDialog.cpp
+++ b/interface/src/ui/HMDToolsDialog.cpp
@@ -87,7 +87,7 @@ HMDToolsDialog::HMDToolsDialog(QWidget* parent) :
     }
     
     // when the application is about to quit, leave HDM mode
-    connect(Application::getInstance(), SIGNAL(aboutToQuit()), this, SLOT(aboutToQuit()));
+    connect(Application::getInstance(), SIGNAL(beforeAboutToQuit()), this, SLOT(aboutToQuit()));
 
     // keep track of changes to the number of screens
     connect(QApplication::desktop(), &QDesktopWidget::screenCountChanged, this, &HMDToolsDialog::screenCountChanged);