diff --git a/configs/emulationstation/custom_systems/es_find_rules.xml b/configs/emulationstation/custom_systems/es_find_rules.xml
index 30ce063b9..73c56fced 100644
--- a/configs/emulationstation/custom_systems/es_find_rules.xml
+++ b/configs/emulationstation/custom_systems/es_find_rules.xml
@@ -33,6 +33,12 @@
             <entry>/usr/pkg/lib/libretro</entry>
         </rule>
     </core>
+    <emulator name="SHADPS4">
+        <!-- PS4 emulator ShadPS4 -->
+        <rule type="staticpath">
+            <entry>~/Applications/Shadps4*.AppImage</entry>
+        </rule>
+    </emulator>
     <emulator name="YUZU">
         <!-- Nintendo Switch emulator Yuzu -->
         <rule type="systempath">
diff --git a/configs/emulationstation/custom_systems/es_systems.xml b/configs/emulationstation/custom_systems/es_systems.xml
index 272247ebc..75ca2c3fc 100644
--- a/configs/emulationstation/custom_systems/es_systems.xml
+++ b/configs/emulationstation/custom_systems/es_systems.xml
@@ -58,4 +58,22 @@
 	<platform>xbox360</platform>
 	<theme>xbox360</theme>
   </system>
+  <system>
+	  <name>ps4</name>
+	  <fullname>Sony PlayStation 4</fullname>
+	  <path>%ROMPATH%/ps4/shortcuts</path>
+	  <extension>.desktop</extension>
+	  <command label="ShadPS4 Shortcuts (Standalone)">%HIDEWINDOW% %ESCAPESPECIALS% %EMULATOR_OS-SHELL% %ROM%</command>
+	  <platform>ps4</platform>
+	  <theme>ps4</theme>
+  </system>
+  <!-- <system>
+		<name>ps4-pkg</name>
+		<fullname>Sony PlayStation 4</fullname>
+		<path>%ROMPATH%\ps4</path>
+		<extension>.desktop</extension>
+		<command label="ShadPS4 PKG (Standalone)">%EMULATOR_SHADPS4% %ROM%</command>
+		<platform>ps4</platform>
+		<theme>ps4</theme>
+	</system> -->
 </systemList>
diff --git a/configs/steam-rom-manager/userData/userConfigurations.json b/configs/steam-rom-manager/userData/userConfigurations.json
index 5a38bcc24..9027b1ad6 100644
--- a/configs/steam-rom-manager/userData/userConfigurations.json
+++ b/configs/steam-rom-manager/userData/userConfigurations.json
@@ -9220,7 +9220,7 @@
         "configTitle": "Sony PlayStation 4 - ShadPS4 (Installed PKG)",
         "steamDirectory": "${steamdirglobal}",
         "romDirectory": "/run/media/mmcblk0p1/Emulation/storage/shadps4/games",
-        "executableArgs": "-g \"'${filePath}'\"",
+        "executableArgs": "\"'${filePath}'\"",
         "executableModifier": "\"${exePath}\"",
         "startInDirectory": "",
         "titleModifier": "${fuzzyTitle}",
@@ -9299,6 +9299,90 @@
             "Sony PlayStation 4"
         ]
     },
+    {
+        "parserType": "Glob",
+        "configTitle": "Sony PlayStation 4 - ShadPS4 (Shortcut)",
+        "steamDirectory": "${steamdirglobal}",
+        "romDirectory": "${romsdirglobal}/ps4/shortcuts",
+        "executableArgs": "-batch -fullscreen \"'${filePath}'\"",
+        "executableModifier": "\"${exePath}\"",
+        "startInDirectory": "",
+        "titleModifier": "${fuzzyTitle}",
+        "imageProviders": [
+            "sgdb",
+            "steamCDN"
+        ],
+        "onlineImageQueries": "${${fuzzyTitle}}",
+        "imagePool": "${fuzzyTitle}",
+        "disabled": false,
+        "userAccounts": {
+            "specifiedAccounts": [
+                "Global"
+            ]
+        },
+        "executable": {
+            "path": "/run/media/mmcblk0p1/Emulation/tools/launchers/shadps4.sh",
+            "shortcutPassthrough": false,
+            "appendArgsToExecutable": false
+        },
+        "parserInputs": {
+            "glob": "**/@(.desktop)"
+        },
+        "titleFromVariable": {
+            "limitToGroups": "",
+            "caseInsensitiveVariables": false,
+            "skipFileIfVariableWasNotFound": false
+        },
+        "fuzzyMatch": {
+            "replaceDiacritics": true,
+            "removeCharacters": true,
+            "removeBrackets": true
+        },
+        "imageProviderAPIs": {
+            "sgdb": {
+                "nsfw": false,
+                "humor": false,
+                "styles": [],
+                "stylesHero": [],
+                "stylesLogo": [],
+                "stylesIcon": [],
+                "imageMotionTypes": [
+                    "static"
+                ]
+            }
+        },
+        "parserId": "164712748872922785",
+        "version": 22,
+        "controllers": {
+            "ps4": null,
+            "ps5": null,
+            "xbox360": null,
+            "xboxone": null,
+            "switch_joycon_left": null,
+            "switch_joycon_right": null,
+            "switch_pro": null,
+            "neptune": null
+        },
+        "defaultImage": {
+            "long": "",
+            "tall": "",
+            "hero": "",
+            "logo": "",
+            "icon": "/home/deck/.config/EmuDeck/backend/configs/steam-rom-manager/userData/img/default/icon.png"
+        },
+        "localImages": {
+            "long": "",
+            "tall": "",
+            "hero": "",
+            "logo": "",
+            "icon": ""
+        },
+        "steamInputEnabled": "1",
+        "drmProtect": false,
+        "steamCategories": [
+            "Sony PlayStation 4"
+        ]
+    },
     {
         "parserType": "Glob",
         "configTitle": "Sony PlayStation Portable - PPSSPP (Standalone)",
diff --git a/roms/ps4/shortcuts/readme.txt b/roms/ps4/shortcuts/readme.txt
new file mode 100644
index 000000000..9636535f6
--- /dev/null
+++ b/roms/ps4/shortcuts/readme.txt
@@ -0,0 +1 @@
+Place your .desktop files here.
\ No newline at end of file