diff --git a/configs/org.libretro.RetroArch/config/retroarch/retroarch.cfg b/configs/org.libretro.RetroArch/config/retroarch/retroarch.cfg
index 00c222486..84ac28d4f 100644
--- a/configs/org.libretro.RetroArch/config/retroarch/retroarch.cfg
+++ b/configs/org.libretro.RetroArch/config/retroarch/retroarch.cfg
@@ -215,7 +215,7 @@ input_disk_prev = "nul"
 input_disk_prev_axis = "nul"
 input_disk_prev_btn = "nul"
 input_disk_prev_mbtn = "nul"
-input_driver = "x"
+input_driver = "sdl"
 input_duty_cycle = "3"
 input_enable_hotkey = "nul"
 input_enable_hotkey_axis = "nul"
diff --git a/functions/EmuScripts/emuDeckRetroArch.sh b/functions/EmuScripts/emuDeckRetroArch.sh
index c768f6742..bc262c3d8 100644
--- a/functions/EmuScripts/emuDeckRetroArch.sh
+++ b/functions/EmuScripts/emuDeckRetroArch.sh
@@ -38,7 +38,7 @@ RetroArch_init(){
 	RetroArch_installCores
 	RetroArch_setUpCoreOptAll
 	RetroArch_setConfigAll
-
+	RetroArch_setupConfigurations
 	RetroArch_setCustomizations
 	RetroArch_autoSave
 	RetroArch_setRetroAchievements
@@ -154,6 +154,7 @@ RetroArch_update(){
 	RetroArch_setEmulationFolder
 	RetroArch_setupSaves
 	RetroArch_setupStorage
+ 	RetroArch_setupConfigurations
 	RetroArch_installCores
 	RetroArch_setUpCoreOptAll
 	RetroArch_setConfigAll
@@ -189,6 +190,15 @@ RetroArch_setupStorage(){
 	rsync -a --ignore-existing '/var/lib/flatpak/app/org.libretro.RetroArch/current/active/files/share/libretro/database/cht/' "$storagePath/retroarch/cheats"
 }
 
+#SetupConfigurations
+RetroArch_setupConfigurations(){
+
+	# Set input driver to SDL. X input driver does not seem to work ootb on some non-SteamOS distributions including ChimeraOS. 
+	input_driver='input_driver = '
+	input_driverSetting="${input_driver}"\""sdl"\"
+	changeLine "$input_driver" "$input_driverSetting" "$RetroArch_configFile"
+
+}
 
 #WipeSettings
 RetroArch_wipe(){