diff --git a/rpcs3/Emu/Cell/PPUThread.h b/rpcs3/Emu/Cell/PPUThread.h
index 1b79954207..acff6e6bfa 100644
--- a/rpcs3/Emu/Cell/PPUThread.h
+++ b/rpcs3/Emu/Cell/PPUThread.h
@@ -128,7 +128,6 @@ struct cmd64
 enum class ppu_debugger_mode : u32
 {
 	_default,
-	is_float,
 	is_decimal,
 
 	max_mode,
diff --git a/rpcs3/Emu/System.cpp b/rpcs3/Emu/System.cpp
index 2cd9b3af56..310af43a4b 100644
--- a/rpcs3/Emu/System.cpp
+++ b/rpcs3/Emu/System.cpp
@@ -858,6 +858,8 @@ game_boot_result Emulator::Load(const std::string& title_id, bool is_disc_patch,
 		}
 	} cleanup{this};
 
+	std::string inherited_ps3_game_path;
+
 	{
 		Init();
 
@@ -924,7 +926,15 @@ game_boot_result Emulator::Load(const std::string& title_id, bool is_disc_patch,
 				// Load /dev_bdvd/ from game list if available
 				if (std::string game_path = m_games_config.get_path(m_title_id); !game_path.empty())
 				{
-					disc = std::move(game_path);
+					if (game_path.ends_with("/./"))
+					{
+						// Marked as PS3_GAME directory
+						inherited_ps3_game_path = std::move(game_path).substr(0, game_path.size() - 3);
+					}
+					else
+					{
+						disc = std::move(game_path);
+					}
 				}
 				else if (!g_cfg.savestate.state_inspection_mode)
 				{
@@ -1491,7 +1501,15 @@ game_boot_result Emulator::Load(const std::string& title_id, bool is_disc_patch,
 			// Load /dev_bdvd/ from game list if available
 			if (std::string game_path = m_games_config.get_path(m_title_id); !game_path.empty())
 			{
-				bdvd_dir = std::move(game_path);
+				if (game_path.ends_with("/./"))
+				{
+					// Marked as PS3_GAME directory
+					inherited_ps3_game_path = std::move(game_path).substr(0, game_path.size() - 3);
+				}
+				else
+				{
+					bdvd_dir = std::move(game_path);
+				}
 			}
 			else
 			{
@@ -1593,7 +1611,7 @@ game_boot_result Emulator::Load(const std::string& title_id, bool is_disc_patch,
 				vfs::mount("/dev_hdd0/game/" + m_title_id, game_dir + '/');
 			}
 		}
-		else if (m_cat == "DG" && from_hdd0_game && disc.empty())
+		else if (!inherited_ps3_game_path.empty() || (from_hdd0_game && m_cat == "DG" && disc.empty()))
 		{
 			// Disc game located in dev_hdd0/game
 			bdvd_dir = g_cfg_vfs.get(g_cfg_vfs.dev_bdvd, rpcs3::utils::get_emu_dir());
@@ -1604,9 +1622,23 @@ game_boot_result Emulator::Load(const std::string& title_id, bool is_disc_patch,
 				return game_boot_result::invalid_bdvd_folder;
 			}
 
+			// TODO: Verify timestamps and error codes with sys_fs
 			vfs::mount("/dev_bdvd", bdvd_dir);
-			vfs::mount("/dev_bdvd/PS3_GAME", hdd0_game + m_path.substr(hdd0_game.size(), 10));
-			sys_log.notice("Game: %s", vfs::get("/dev_bdvd/PS3_GAME"));
+
+			vfs::mount("/dev_bdvd/PS3_GAME", inherited_ps3_game_path.empty() ? hdd0_game + m_path.substr(hdd0_game.size(), 10) : inherited_ps3_game_path);
+
+			const std::string new_ps3_game = vfs::get("/dev_bdvd/PS3_GAME");
+			sys_log.notice("Game: %s", new_ps3_game);
+
+			// Store /dev_bdvd/PS3_GAME location
+			if (m_games_config.add_game(m_title_id, new_ps3_game + "/./"))
+			{
+				sys_log.notice("Registered BDVD/PS3_GAME game directory for title '%s': %s", m_title_id, new_ps3_game);
+			}
+			else
+			{
+				sys_log.error("Failed to save BDVD/PS3_GAME location of title '%s' (error=%s)", m_title_id, fs::g_tls_error);
+			}
 		}
 		else if (disc.empty())
 		{
diff --git a/rpcs3/rpcs3qt/game_list_frame.cpp b/rpcs3/rpcs3qt/game_list_frame.cpp
index 98a1f9867c..76ec618526 100644
--- a/rpcs3/rpcs3qt/game_list_frame.cpp
+++ b/rpcs3/rpcs3qt/game_list_frame.cpp
@@ -346,7 +346,7 @@ void game_list_frame::Refresh(const bool from_drive, const bool scroll_after)
 
 		Emu.AddGamesFromDir(g_cfg_vfs.get(g_cfg_vfs.games_dir, rpcs3::utils::get_emu_dir()));
 
-		const std::string _hdd = rpcs3::utils::get_hdd0_dir();
+		const std::string _hdd = Emu.GetCallbacks().resolve_path(rpcs3::utils::get_hdd0_dir()) + '/';
 
 		m_parsing_watcher.setFuture(QtConcurrent::map(m_parsing_threads, [this, _hdd](int index)
 		{
@@ -371,7 +371,9 @@ void game_list_frame::Refresh(const bool from_drive, const bool scroll_after)
 				}
 			};
 
-			add_dir(_hdd + "game/", false);
+			const std::string hdd0_game = _hdd + "game/";
+
+			add_dir(hdd0_game, false);
 			add_dir(_hdd + "disc/", true); // Deprecated
 
 			for (const auto& [serial, path] : Emu.GetGamesConfig().get_games())
@@ -379,7 +381,7 @@ void game_list_frame::Refresh(const bool from_drive, const bool scroll_after)
 				std::string game_dir = path;
 				game_dir.resize(game_dir.find_last_not_of('/') + 1);
 
-				if (game_dir.empty())
+				if (game_dir.empty() || path.starts_with(hdd0_game))
 				{
 					continue;
 				}