diff --git a/guilib/src/MainWindow.cpp b/guilib/src/MainWindow.cpp
index 7cdc4f9b..8afdf710 100644
--- a/guilib/src/MainWindow.cpp
+++ b/guilib/src/MainWindow.cpp
@@ -2536,7 +2536,8 @@ void MainWindow::editDatabase()
 	if(!path.isEmpty())
 	{
 		DatabaseViewer * viewer = new DatabaseViewer(this);
-		viewer->setWindowFlags(Qt::Dialog);
+		viewer->setWindowModality(Qt::WindowModal);
+		viewer->setAttribute(Qt::WA_DeleteOnClose, true);
 		if(viewer->openDatabase(path))
 		{
 			if(viewer->isSavedMaximized())
diff --git a/guilib/src/PreferencesDialog.cpp b/guilib/src/PreferencesDialog.cpp
index 2662e430..28a45afd 100644
--- a/guilib/src/PreferencesDialog.cpp
+++ b/guilib/src/PreferencesDialog.cpp
@@ -2113,6 +2113,7 @@ void PreferencesDialog::openDatabaseViewer()
 {
 	DatabaseViewer * viewer = new DatabaseViewer(this);
 	viewer->setWindowModality(Qt::WindowModal);
+	viewer->setAttribute(Qt::WA_DeleteOnClose, true);
 	if(viewer->openDatabase(_ui->source_database_lineEdit_path->text()))
 	{
 		viewer->show();