diff --git a/rpcs3/Emu/System.cpp b/rpcs3/Emu/System.cpp
index 40a87fcab8..e92dc9f8a0 100644
--- a/rpcs3/Emu/System.cpp
+++ b/rpcs3/Emu/System.cpp
@@ -4018,7 +4018,9 @@ void Emulator::Kill(bool allow_autoexit, bool savestate, savestate_stage* save_s
 
 			if (allow_autoexit)
 			{
-				Quit(g_cfg.misc.autoexit.get());
+				const bool autoexit = g_cfg.misc.autoexit.get();
+				sys_log.notice("Quit with main_window::closeEvent. (autoexit=%d)", autoexit);
+				Quit(autoexit);
 			}
 
 			if (after_kill_callback)
diff --git a/rpcs3/headless_application.cpp b/rpcs3/headless_application.cpp
index 5d9240254d..cd8e027f57 100644
--- a/rpcs3/headless_application.cpp
+++ b/rpcs3/headless_application.cpp
@@ -58,7 +58,7 @@ void headless_application::InitializeCallbacks()
 				on_exit();
 			}
 
-			sys_log.notice("Quitting headless application");
+			sys_log.notice("Quitting headless application (force_quit=%d)", force_quit);
 			quit();
 			return true;
 		}
diff --git a/rpcs3/rpcs3qt/gui_application.cpp b/rpcs3/rpcs3qt/gui_application.cpp
index 8379e2f5e0..756dbe18ed 100644
--- a/rpcs3/rpcs3qt/gui_application.cpp
+++ b/rpcs3/rpcs3qt/gui_application.cpp
@@ -640,13 +640,15 @@ void gui_application::InitializeCallbacks()
 				on_exit();
 			}
 
+			const bool no_gui = !m_main_window;
+
 			if (m_main_window)
 			{
 				// Close main window in order to save its window state
 				m_main_window->close();
 			}
 
-			gui_log.notice("Quitting gui application");
+			gui_log.notice("Quitting gui application (force_quit=%d, no-gui=%d)", force_quit, no_gui);
 			quit();
 			return true;
 		}
diff --git a/rpcs3/rpcs3qt/main_window.cpp b/rpcs3/rpcs3qt/main_window.cpp
index c5e7eb09b4..cfd2394d7c 100644
--- a/rpcs3/rpcs3qt/main_window.cpp
+++ b/rpcs3/rpcs3qt/main_window.cpp
@@ -3944,6 +3944,7 @@ void main_window::closeEvent(QCloseEvent* closeEvent)
 
 	Q_EMIT NotifyWindowCloseEvent(true);
 
+	gui_log.notice("Quit with main_window::closeEvent");
 	Emu.Quit(true);
 }