diff --git a/app/main.cpp b/app/main.cpp
index 14164fd21..f60faa79a 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -119,6 +119,7 @@ static int runQtApplication(int argc, char* argv[], qtwebapp::LoggerWithFile *lo
 
 	MainWindow w(logger, parser);
 	w.show();
+	QObject::connect(&a, SIGNAL(aboutToQuit()), &w, SLOT(on_action_Exit_triggered()));
 
 	return a.exec();
 }
diff --git a/plugins/channelrx/demodbfm/bfmdemodgui.cpp b/plugins/channelrx/demodbfm/bfmdemodgui.cpp
index 6707b01dd..92b73f77c 100644
--- a/plugins/channelrx/demodbfm/bfmdemodgui.cpp
+++ b/plugins/channelrx/demodbfm/bfmdemodgui.cpp
@@ -388,6 +388,7 @@ BFMDemodGUI::~BFMDemodGUI()
 {
     m_deviceUISet->removeRxChannelInstance(this);
 	delete m_bfmDemod; // TODO: check this: when the GUI closes it has to delete the demodulator
+	delete m_spectrumVis;
 	delete ui;
 }