diff --git a/rpcs3/rpcs3qt/gui_application.cpp b/rpcs3/rpcs3qt/gui_application.cpp
index 9fcadcfa2e..95f56b7184 100644
--- a/rpcs3/rpcs3qt/gui_application.cpp
+++ b/rpcs3/rpcs3qt/gui_application.cpp
@@ -69,17 +69,17 @@ void gui_application::Init()
 	// Create connects to propagate events throughout Gui.
 	InitializeConnects();
 
-	if (m_main_window)
-	{
-		m_main_window->Init();
-	}
-
 	if (m_gui_settings->GetValue(gui::ib_show_welcome).toBool())
 	{
 		welcome_dialog* welcome = new welcome_dialog();
 		welcome->exec();
 	}
 
+	if (m_main_window)
+	{
+		m_main_window->Init();
+	}
+
 #ifdef WITH_DISCORD_RPC
 	// Discord Rich Presence Integration
 	if (m_gui_settings->GetValue(gui::m_richPresence).toBool())
diff --git a/rpcs3/rpcs3qt/main_window.cpp b/rpcs3/rpcs3qt/main_window.cpp
index 0a19c8a029..9368560793 100644
--- a/rpcs3/rpcs3qt/main_window.cpp
+++ b/rpcs3/rpcs3qt/main_window.cpp
@@ -1,6 +1,6 @@
-#include <QMessageBox>
-#include <QFileDialog>
+#include "stdafx.h"
 
+#include "main_window.h"
 #include "qt_utils.h"
 #include "vfs_dialog.h"
 #include "save_manager_dialog.h"
@@ -16,7 +16,6 @@
 #include "memory_string_searcher.h"
 #include "memory_viewer_panel.h"
 #include "rsx_debugger.h"
-#include "main_window.h"
 #include "about_dialog.h"
 #include "pad_settings_dialog.h"
 #include "progress_dialog.h"
@@ -31,8 +30,9 @@
 #include <QScreen>
 #include <QDirIterator>
 #include <QMimeData>
+#include <QMessageBox>
+#include <QFileDialog>
 
-#include "stdafx.h"
 #include "rpcs3_version.h"
 #include "Emu/System.h"
 #include "Emu/system_config.h"