diff --git a/core/src/mainwindow.cpp b/core/src/mainwindow.cpp
index 9465e64..e7dafe8 100644
--- a/core/src/mainwindow.cpp
+++ b/core/src/mainwindow.cpp
@@ -342,6 +342,8 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
 
 	windowsettings.endGroup();
 
+	this->setAttribute(Qt::WA_DeleteOnClose,true);
+
 
 }
 void MainWindow::menu_windows_interrogateProgressViewClicked()
@@ -1964,6 +1966,14 @@ MainWindow::~MainWindow()
 	windowsettings.endGroup();
 	windowsettings.sync();
 
+	//Remove all WizardView windows
+	for (int i=0;i<m_wizardList.size();i++)
+	{
+		m_wizardList[i]->close();
+		delete m_wizardList[i];
+	}
+	m_wizardList.clear();
+
 	emsComms->stop();
 	emsComms->wait(1000);
 	delete emsComms;