diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp
index d1d5260c9..310148003 100644
--- a/desktop-widgets/mainwindow.cpp
+++ b/desktop-widgets/mainwindow.cpp
@@ -111,7 +111,7 @@ extern "C" void showErrorFromC(char *buf)
 	emit MainWindow::instance()->showError(error);
 }
 
-MainWindow::MainWindow() : QMainWindow(),
+MainWindow::MainWindow() :
 	appState((ApplicationState)-1), // Invalid state
 	actionNextDive(nullptr),
 	actionPreviousDive(nullptr),
diff --git a/subsurface-helper.cpp b/subsurface-helper.cpp
index e0d8f18d6..375d6e84a 100644
--- a/subsurface-helper.cpp
+++ b/subsurface-helper.cpp
@@ -58,16 +58,13 @@ void init_ui()
 #ifndef SUBSURFACE_MOBILE
 	register_qml_types(NULL);
 
-	MainWindow *window = new MainWindow();
+	MainWindow *window = make_global<MainWindow>();
 	window->setTitle();
 #endif // SUBSURFACE_MOBILE
 }
 
 void exit_ui()
 {
-#ifndef SUBSURFACE_MOBILE
-	delete MainWindow::instance();
-#endif // SUBSURFACE_MOBILE
 	free_globals();
 	free((void *)existing_filename);
 }