diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index 51911ae4..2213991c 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -974,10 +974,10 @@ modules:
        # in non-writable paths, typically happens when a user
        # has leftover files from a previous non-flatpak install
       - type: patch
-        path: rd-submodules/dolphin/detectflatpak.patch
+        path: rd-submodules/primehack/detectflatpak.patch
        # version strings must match exactly for online multiplayer
       - type: patch
-        path: rd-submodules/dolphin/nodirtyversion.patch
+        path: rd-submodules/primehack/nodirtyversion.patch
       - type: script
         commands:
           - for i in {0..9}; do
diff --git a/rd-submodules/primehack/detectflatpak.patch b/rd-submodules/primehack/detectflatpak.patch
new file mode 100644
index 00000000..60dd1a2d
--- /dev/null
+++ b/rd-submodules/primehack/detectflatpak.patch
@@ -0,0 +1,34 @@
+From f2d3b349d8487cf0ee50b36ba024ac513d36f826 Mon Sep 17 00:00:00 2001
+From: Carles Pastor <cpbadosa@gmail.com>
+Date: Sat, 20 Aug 2022 13:35:32 +0200
+Subject: [PATCH] Detect we are running inside a flatpak sandbox
+
+---
+ Source/Core/UICommon/UICommon.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Source/Core/UICommon/UICommon.cpp b/Source/Core/UICommon/UICommon.cpp
+index 8d9dc2abb8..8a9d39a3d5 100644
+--- a/Source/Core/UICommon/UICommon.cpp
++++ b/Source/Core/UICommon/UICommon.cpp
+@@ -348,7 +348,7 @@ void SetUserDirectory(std::string custom_path)
+     //    -> Use GetExeDirectory()/User
+     // 2. $DOLPHIN_EMU_USERPATH is set
+     //    -> Use $DOLPHIN_EMU_USERPATH
+-    // 3. ~/.dolphin-emu directory exists
++    // 3. ~/.dolphin-emu directory exists, and we're not in flatpak
+     //    -> Use ~/.dolphin-emu
+     // 4. Default
+     //    -> Use XDG basedir, see
+@@ -381,7 +381,7 @@ void SetUserDirectory(std::string custom_path)
+     {
+       user_path = home_path + "." DOLPHIN_DATA_DIR DIR_SEP;
+ 
+-      if (!File::Exists(user_path))
++      if (File::Exists("/.flatpak-info") || !File::Exists(user_path))
+       {
+         const char* data_home = getenv("XDG_DATA_HOME");
+         std::string data_path =
+-- 
+2.37.1
+
diff --git a/rd-submodules/primehack/nodirtyversion.patch b/rd-submodules/primehack/nodirtyversion.patch
new file mode 100644
index 00000000..20b6f3c1
--- /dev/null
+++ b/rd-submodules/primehack/nodirtyversion.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9af66009a1..2acd3bed9a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -149,7 +149,7 @@ if(GIT_FOUND)
+       OUTPUT_VARIABLE DOLPHIN_WC_REVISION
+       OUTPUT_STRIP_TRAILING_WHITESPACE)
+   # defines DOLPHIN_WC_DESCRIBE
+-  execute_process(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} describe --always --long --dirty
++  execute_process(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} describe --always --long
+       OUTPUT_VARIABLE DOLPHIN_WC_DESCRIBE
+       OUTPUT_STRIP_TRAILING_WHITESPACE)
+