diff --git a/rpcs3/Emu/Cell/PPUModule.cpp b/rpcs3/Emu/Cell/PPUModule.cpp
index 805193d284..0ac3092cb3 100644
--- a/rpcs3/Emu/Cell/PPUModule.cpp
+++ b/rpcs3/Emu/Cell/PPUModule.cpp
@@ -2043,7 +2043,7 @@ bool ppu_load_exec(const ppu_exec_object& elf, utils::serial* ar)
 
 	// Initialize memory stats (according to sdk version)
 	u32 mem_size;
-	if (g_ps3_process_info.get_cellos_appname() == "vsh.self"sv)
+	if (Emu.IsVsh())
 	{
 		// Because vsh.self comes before any generic application, more memory is available to it
 		mem_size = 0xF000000;
@@ -2096,7 +2096,7 @@ bool ppu_load_exec(const ppu_exec_object& elf, utils::serial* ar)
 		load_libs.emplace("libsysmodule.sprx");
 	}
 
-	if (ar || g_ps3_process_info.get_cellos_appname() == "vsh.self"sv)
+	if (ar || Emu.IsVsh())
 	{
 		// Cannot be used with vsh.self or savestates (they self-manage itself)
 		load_libs.clear();
@@ -2271,7 +2271,7 @@ bool ppu_load_exec(const ppu_exec_object& elf, utils::serial* ar)
 
 	ppu->cmd_push({ppu_cmd::initialize, 0});
 
-	if (!entry && g_ps3_process_info.get_cellos_appname() != "vsh.self"sv)
+	if (!entry && !Emu.IsVsh())
 	{
 		// Set TLS args, call sys_initialize_tls
 		ppu->cmd_list
diff --git a/rpcs3/Emu/Cell/lv2/sys_event.cpp b/rpcs3/Emu/Cell/lv2/sys_event.cpp
index cd83840f81..d47fac1b0f 100644
--- a/rpcs3/Emu/Cell/lv2/sys_event.cpp
+++ b/rpcs3/Emu/Cell/lv2/sys_event.cpp
@@ -432,7 +432,7 @@ error_code sys_event_queue_receive(ppu_thread& ppu, u32 equeue_id, vm::ptr<sys_e
 
 		// "/dev_flash/vsh/module/msmw2.sprx" seems to rely on some cryptic shared memory behaviour that we don't emulate correctly
 		// This is a hack to avoid waiting for 1m40s every time we boot vsh
-		if (queue.key == 0x8005911000000012 && g_ps3_process_info.get_cellos_appname() == "vsh.self"sv)
+		if (queue.key == 0x8005911000000012 && Emu.IsVsh())
 		{
 			sys_event.todo("sys_event_queue_receive(equeue_id=0x%x, *0x%x, timeout=0x%llx) Bypassing timeout for msmw2.sprx", equeue_id, dummy_event, timeout);
 			timeout = 1;
diff --git a/rpcs3/Emu/Cell/lv2/sys_process.cpp b/rpcs3/Emu/Cell/lv2/sys_process.cpp
index 6a4edc1018..9a94a7c0e6 100644
--- a/rpcs3/Emu/Cell/lv2/sys_process.cpp
+++ b/rpcs3/Emu/Cell/lv2/sys_process.cpp
@@ -44,7 +44,7 @@ bool ps3_process_info_t::has_debug_perm() const
 	return (ctrl_flags1 & (0xa << 28)) != 0;
 }
 
-// If a SELF file is of CellOS return its filename, otheriwse return an empty string 
+// If a SELF file is of CellOS return its filename, otheriwse return an empty string
 std::string_view ps3_process_info_t::get_cellos_appname() const
 {
 	if (!has_root_perm() || !Emu.GetTitleID().empty())
diff --git a/rpcs3/Emu/System.cpp b/rpcs3/Emu/System.cpp
index 8da953e0b6..0f54e6715e 100644
--- a/rpcs3/Emu/System.cpp
+++ b/rpcs3/Emu/System.cpp
@@ -3274,4 +3274,9 @@ utils::serial* Emulator::DeserialManager() const
 	return m_ar.get();
 }
 
+bool Emulator::IsVsh()
+{
+	return g_ps3_process_info.get_cellos_appname() == "vsh.self"sv;
+}
+
 Emulator Emu;
diff --git a/rpcs3/Emu/System.h b/rpcs3/Emu/System.h
index c503e13a46..ce8efffa63 100644
--- a/rpcs3/Emu/System.h
+++ b/rpcs3/Emu/System.h
@@ -340,6 +340,8 @@ public:
 	static game_boot_result GetElfPathFromDir(std::string& elf_path, const std::string& path);
 	static void GetBdvdDir(std::string& bdvd_dir, std::string& sfb_dir, std::string& game_dir, const std::string& elf_dir);
 	friend void init_fxo_for_exec(utils::serial*, bool);
+
+	static bool IsVsh();
 };
 
 extern Emulator Emu;
diff --git a/rpcs3/Input/pad_thread.cpp b/rpcs3/Input/pad_thread.cpp
index 21538e09e8..58ce5cadff 100644
--- a/rpcs3/Input/pad_thread.cpp
+++ b/rpcs3/Input/pad_thread.cpp
@@ -242,6 +242,8 @@ void pad_thread::operator()()
 {
 	Init();
 
+	const bool is_vsh = Emu.IsVsh();
+
 	pad::g_reset = false;
 	pad::g_started = true;
 
@@ -401,7 +403,7 @@ void pad_thread::operator()()
 		}
 
 		// Handle home menu if requested
-		if (!m_home_menu_open && Emu.IsRunning())
+		if (!is_vsh && !m_home_menu_open && Emu.IsRunning())
 		{
 			for (usz i = 0; i < m_pads.size(); i++)
 			{
diff --git a/rpcs3/rpcs3qt/gui_application.cpp b/rpcs3/rpcs3qt/gui_application.cpp
index b0cc77cc8a..0a23ed4d8d 100644
--- a/rpcs3/rpcs3qt/gui_application.cpp
+++ b/rpcs3/rpcs3qt/gui_application.cpp
@@ -21,7 +21,6 @@
 #include "Emu/Io/Null/null_music_handler.h"
 #include "Emu/Cell/Modules/cellAudio.h"
 #include "Emu/Cell/lv2/sys_rsxaudio.h"
-#include "Emu/Cell/lv2/sys_process.h"
 #include "Emu/RSX/Overlays/overlay_perf_metrics.h"
 #include "Emu/system_utils.hpp"
 #include "Emu/vfs_config.h"
@@ -660,7 +659,7 @@ void gui_application::OnEmuSettingsChange()
 	if (!Emu.IsStopped())
 	{
 		// Force audio provider
-		if (g_ps3_process_info.get_cellos_appname() == "vsh.self"sv)
+		if (Emu.IsVsh())
 		{
 			g_cfg.audio.provider.set(audio_provider::rsxaudio);
 		}