diff --git a/rpcs3/Emu/System.cpp b/rpcs3/Emu/System.cpp
index 300b9f11a7..893d8c64dc 100644
--- a/rpcs3/Emu/System.cpp
+++ b/rpcs3/Emu/System.cpp
@@ -801,6 +801,8 @@ game_boot_result Emulator::Load(const std::string& title_id, bool add_only, bool
 
 				if (IsStopped())
 				{
+					m_path = m_path_old; // Reset m_path to fix boot from gui
+					GetCallbacks().on_stop(); // Call on_stop to refresh gui
 					return;
 				}
 
@@ -812,6 +814,9 @@ game_boot_result Emulator::Load(const std::string& title_id, bool add_only, bool
 					Emu.SetForceBoot(true);
 					Emu.Stop();
 				});
+
+				m_path = m_path_old; // Reset m_path to fix boot from gui
+				GetCallbacks().on_stop(); // Call on_stop to refresh gui
 			});
 
 			return game_boot_result::no_errors;
diff --git a/rpcs3/rpcs3qt/main_window.cpp b/rpcs3/rpcs3qt/main_window.cpp
index 0d99003b04..86f242d037 100644
--- a/rpcs3/rpcs3qt/main_window.cpp
+++ b/rpcs3/rpcs3qt/main_window.cpp
@@ -1566,7 +1566,7 @@ void main_window::OnEmuStop()
 
 	EnableMenus(false);
 
-	if (Emu.GetBoot().empty())
+	if (title.isEmpty())
 	{
 		ui->toolbar_start->setIcon(m_icon_play);
 		ui->toolbar_start->setText(tr("Play"));