diff --git a/emu-configs/retroarch.cfg b/emu-configs/retroarch.cfg
index 1eb1b6db..265c05f8 100644
--- a/emu-configs/retroarch.cfg
+++ b/emu-configs/retroarch.cfg
@@ -60,7 +60,7 @@ cheevos_auto_screenshot = "true"
 cheevos_badges_enable = "false"
 cheevos_challenge_indicators = "true"
 cheevos_custom_host = ""
-cheevos_enable = "true"
+cheevos_enable = "false"
 cheevos_hardcore_mode_enable = "false"
 cheevos_leaderboards_enable = "true"
 cheevos_password = ""
diff --git a/es-configs/tools-gamelist.xml b/es-configs/tools-gamelist.xml
index b1341252..e59195be 100644
--- a/es-configs/tools-gamelist.xml
+++ b/es-configs/tools-gamelist.xml
@@ -1,6 +1,13 @@
 <?xml version="1.0"?>
 <gameList>
 	<game>
+		<path>./cheevos.sh</path>
+		<name>RetroAchievements Login</name>
+		<desc>Enter your RetroAchievements account details.</desc>
+		<nogamecount>true</nogamecount>
+		<nomultiscrape>true</nomultiscrape>
+	</game>
+<!--	<game>
 		<path>./start-retroarch.sh</path>
 		<name>Start RetroArch</name>
 		<desc>Start RetroArch to manually tweak your settings.</desc>
@@ -55,7 +62,7 @@
 		<desc>Start RPCS3 to manually tweak your settings.</desc>
 		<nogamecount>true</nogamecount>
 		<nomultiscrape>true</nomultiscrape>
-	</game>
+	</game> -->
 	<game>
 		<path>./start-splore.sh</path>
 		<name>Start Splore</name>
@@ -70,13 +77,13 @@
 		<nogamecount>true</nogamecount>
 		<nomultiscrape>true</nomultiscrape>
 	</game>
-	<game>
+<!--	<game>
 		<path>./overlays.sh</path>
 		<name>Overlays configuration</name>
 		<desc>Configure or disable borders and shaders.</desc>
 		<nogamecount>true</nogamecount>
 		<nomultiscrape>true</nomultiscrape>
-	</game>
+	</game> -->
 	<game>
 		<path>./theme-fix.sh</path>
 		<name>Theme fix</name>
diff --git a/tools/cheevos.sh b/tools/cheevos.sh
new file mode 100755
index 00000000..71897d8a
--- /dev/null
+++ b/tools/cheevos.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+racfg=""
+
+login=$(zenity --forms --title="RetroAchievements Login" \
+    --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \
+	--text="Enter your RetroAchievements Account details.\n\nBe aware that this tool cannot verify your login details.\nFor registration and more info visit\nhttps://retroachievements.org/\n" \
+	--separator="=SEP=" \
+	--add-entry="Username" \
+	--add-password="Password")
+
+arrIN=(${login//=SEP=/ })
+user=${arrIN[0]}
+pass=${arrIN[1]}
+
+sed -i "s%cheevos_enable =.*%cheevos_enable = \"true\"" $racfg
+sed -i "s%cheevos_username =.*%cheevos_username = \"$user\"" $racfg
+sed -i "s%cheevos_password =.*%cheevos_password = \"$pass\"" $racfg