diff --git a/UI/obs-app.cpp b/UI/obs-app.cpp
index 67b4c0fed..a8813f91c 100644
--- a/UI/obs-app.cpp
+++ b/UI/obs-app.cpp
@@ -939,6 +939,8 @@ bool OBSApp::OBSInit()
 		blog(LOG_INFO, "Portable mode: %s",
 				portable_mode ? "true" : "false");
 
+		setQuitOnLastWindowClosed(false);
+
 		mainWindow = new OBSBasic();
 
 		mainWindow->setAttribute(Qt::WA_DeleteOnClose, true);
diff --git a/UI/window-basic-main.cpp b/UI/window-basic-main.cpp
index edcb991de..4d12e8196 100644
--- a/UI/window-basic-main.cpp
+++ b/UI/window-basic-main.cpp
@@ -2977,6 +2977,8 @@ void OBSBasic::closeEvent(QCloseEvent *event)
 	/* Clear all scene data (dialogs, widgets, widget sub-items, scenes,
 	 * sources, etc) so that all references are released before shutdown */
 	ClearSceneData();
+
+	App()->quit();
 }
 
 void OBSBasic::changeEvent(QEvent *event)