diff --git a/src/main/ra.ts b/src/main/ra.ts
index 2f6fd0e..e41ea52 100644
--- a/src/main/ra.ts
+++ b/src/main/ra.ts
@@ -94,7 +94,8 @@ function writeGameListCache(cache: GameListCache): void {
 async function fetchGameList(consoleId: number, apiKey: string, username: string): Promise<RaGameListEntry[]> {
   const url = `https://retroachievements.org/API/API_GetGameList.php?z=${encodeURIComponent(username)}&y=${encodeURIComponent(apiKey)}&c=${consoleId}`;
   const json = await fetchText(url);
-  const data = JSON.parse(json);
+  let data: any;
+  try { data = JSON.parse(json); } catch { return []; }
   if (!Array.isArray(data)) return [];
   return data.map((g: any) => ({ id: g.ID, title: g.Title }));
 }
@@ -138,9 +139,10 @@ async function lookupGameIdByHash(romPath: string): Promise<number | null> {
     const body = `r=gameid&m=${hash}`;
     const response = await postForm('https://retroachievements.org/dorequest.php', body);
     const parsed = JSON.parse(response);
-    if (parsed.Success && parsed.ID) return parsed.ID;
+    if (parsed.Success && (parsed.ID || parsed.GameID)) return parsed.ID || parsed.GameID;
     return null;
-  } catch {
+  } catch (err) {
+    console.error('[ra] hash lookup error:', err);
     return null;
   }
 }
@@ -168,7 +170,7 @@ async function fetchAchievements(
   try {
     const url = `https://retroachievements.org/API/API_GetGameInfoAndUserProgress.php`
       + `?z=${encodeURIComponent(username)}&y=${encodeURIComponent(apiKey)}`
-      + `&i=${gameId}&u=${encodeURIComponent(username)}`;
+      + `&g=${gameId}&u=${encodeURIComponent(username)}`;
     const json = await fetchText(url);
     const data = JSON.parse(json);
     if (!data || !data.Achievements) return null;
@@ -192,7 +194,8 @@ async function fetchAchievements(
       userProgress: achievements.filter(a => a.dateEarned).length,
       achievements,
     };
-  } catch {
+  } catch (err) {
+    console.error('[ra] fetchAchievements error:', err);
     return null;
   }
 }
diff --git a/src/main/settings.ts b/src/main/settings.ts
index 127f5f2..4b52a92 100644
--- a/src/main/settings.ts
+++ b/src/main/settings.ts
@@ -30,6 +30,7 @@ const defaultSettings: AppSettings = {
   biosDirectory: '',
   retroAchievementsUsername: '',
   retroAchievementsPassword: '',
+  retroAchievementsApiKey: '',
 };
 
 let cached: AppSettings | null = null;
diff --git a/src/renderer/components/GameDetailModal.tsx b/src/renderer/components/GameDetailModal.tsx
index cc82591..ad893cf 100644
--- a/src/renderer/components/GameDetailModal.tsx
+++ b/src/renderer/components/GameDetailModal.tsx
@@ -97,82 +97,83 @@ export function GameDetailModal({ game, onClose, onLaunch }: Props) {
           </div>
 
           <div className="game-detail-right">
-            {loadingMeta ? (
-              <div className="text-sm text-muted" style={{ padding: 12 }}>Loading metadata...</div>
-            ) : (
-              <>
-                <div className="game-detail-meta">
-                  {metadata?.year && (
-                    <div className="meta-row">
-                      <span className="meta-label">Year</span>
-                      <span>{metadata.year}</span>
-                    </div>
-                  )}
-                  {metadata?.genre && (
-                    <div className="meta-row">
-                      <span className="meta-label">Genre</span>
-                      <span>{metadata.genre}</span>
-                    </div>
-                  )}
-                  {metadata?.publisher && (
-                    <div className="meta-row">
-                      <span className="meta-label">Publisher</span>
-                      <span>{metadata.publisher}</span>
-                    </div>
-                  )}
-                  {metadata?.rating !== undefined && metadata.rating > 0 && (
-                    <div className="meta-row">
-                      <span className="meta-label">Rating</span>
-                      <span>{'★'.repeat(Math.round(metadata.rating))}{'☆'.repeat(5 - Math.round(metadata.rating))}</span>
-                    </div>
-                  )}
-                  <div className="meta-row">
-                    <span className="meta-label">Emulator</span>
-                    <span>{game.emulatorId}</span>
-                  </div>
-                  <div className="meta-row">
-                    <span className="meta-label">Played</span>
-                    <span>{game.playCount} time{game.playCount !== 1 ? 's' : ''}</span>
-                  </div>
-                </div>
-
-                {metadata?.description && (
-                  <div className="game-detail-description">
-                    <h4>About</h4>
-                    <p>{metadata.description}</p>
-                  </div>
-                )}
-              </>
-            )}
-
-            <div className="game-detail-achievements">
-              <h4>
-                Achievements
-                {achievements && (
-                  <span className="text-sm text-muted" style={{ fontWeight: 400, marginLeft: 8 }}>
-                    {achievements.userProgress}/{achievements.totalAchievements} · {achievements.totalPoints} pts
-                  </span>
-                )}
-              </h4>
-
-              {loadingAchievements ? (
-                <p className="text-sm text-muted">Loading achievements...</p>
-              ) : achievements ? (
-                <div className="achievement-list">
-                  {achievements.achievements.map((a) => (
-                    <AchievementRow key={a.id} achievement={a} />
-                  ))}
-                </div>
+            <div className="game-detail-right-scroll">
+              {loadingMeta ? (
+                <div className="text-sm text-muted" style={{ padding: 12 }}>Loading metadata...</div>
               ) : (
-                <p className="text-sm text-muted">
-                  Add your RetroAchievements Web API Key in Settings &gt; Utilities to see achievements here.
-                </p>
+                <>
+                  <div className="game-detail-meta">
+                    {metadata?.year && (
+                      <div className="meta-row">
+                        <span className="meta-label">Year</span>
+                        <span>{metadata.year}</span>
+                      </div>
+                    )}
+                    {metadata?.genre && (
+                      <div className="meta-row">
+                        <span className="meta-label">Genre</span>
+                        <span>{metadata.genre}</span>
+                      </div>
+                    )}
+                    {metadata?.publisher && (
+                      <div className="meta-row">
+                        <span className="meta-label">Publisher</span>
+                        <span>{metadata.publisher}</span>
+                      </div>
+                    )}
+                    {metadata?.rating !== undefined && metadata.rating > 0 && (
+                      <div className="meta-row">
+                        <span className="meta-label">Rating</span>
+                        <span>{'★'.repeat(Math.round(metadata.rating))}{'☆'.repeat(5 - Math.round(metadata.rating))}</span>
+                      </div>
+                    )}
+                    <div className="meta-row">
+                      <span className="meta-label">Emulator</span>
+                      <span>{game.emulatorId}</span>
+                    </div>
+                    <div className="meta-row">
+                      <span className="meta-label">Played</span>
+                      <span>{game.playCount} time{game.playCount !== 1 ? 's' : ''}</span>
+                    </div>
+                  </div>
+
+                  {metadata?.description && (
+                    <div className="game-detail-description">
+                      <h4>About</h4>
+                      <p>{metadata.description}</p>
+                    </div>
+                  )}
+                </>
               )}
+
+              <div className="game-detail-achievements">
+                <h4>
+                  Achievements
+                  {achievements && (
+                    <span className="text-sm text-muted" style={{ fontWeight: 400, marginLeft: 8 }}>
+                      {achievements.userProgress}/{achievements.totalAchievements} · {achievements.totalPoints} pts
+                    </span>
+                  )}
+                </h4>
+
+                {loadingAchievements ? (
+                  <p className="text-sm text-muted">Loading achievements...</p>
+                ) : achievements ? (
+                  <div className="achievement-list">
+                    {achievements.achievements.map((a) => (
+                      <AchievementRow key={a.id} achievement={a} />
+                    ))}
+                  </div>
+                ) : (
+                  <p className="text-sm text-muted">
+                    Add your RetroAchievements Web API Key in Settings &gt; Utilities to see achievements here.
+                  </p>
+                )}
+              </div>
             </div>
 
             <button
-              className="btn btn-primary"
-              style={{ marginTop: 'auto', width: '100%' }}
+              className="btn btn-primary game-detail-launch"
               onClick={() => { onLaunch(game); onClose(); }}
             >
               Launch Game
diff --git a/src/renderer/styles.css b/src/renderer/styles.css
index 5f94d6d..3fd6c72 100644
--- a/src/renderer/styles.css
+++ b/src/renderer/styles.css
@@ -924,12 +924,23 @@ select:focus, input[type="text"]:focus {
   flex: 1;
   display: flex;
   flex-direction: column;
-  padding: 20px;
-  gap: 16px;
-  overflow-y: auto;
   min-width: 0;
 }
 
+.game-detail-right-scroll {
+  flex: 1;
+  overflow-y: auto;
+  padding: 20px 20px 0;
+  display: flex;
+  flex-direction: column;
+  gap: 16px;
+}
+
+.game-detail-launch {
+  margin: 12px 20px 20px;
+  flex-shrink: 0;
+}
+
 .game-detail-meta {
   display: grid;
   grid-template-columns: auto 1fr;
@@ -964,6 +975,71 @@ select:focus, input[type="text"]:focus {
   margin: 0;
 }
 
+.achievement-list {
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+  max-height: 320px;
+  overflow-y: auto;
+}
+
+.achievement-row {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  padding: 8px 10px;
+  border-radius: var(--radius);
+  background: var(--bg-secondary);
+  transition: background var(--transition);
+}
+
+.achievement-row.locked {
+  opacity: 0.55;
+}
+
+.achievement-badge {
+  width: 36px;
+  height: 36px;
+  border-radius: 4px;
+  flex-shrink: 0;
+  object-fit: cover;
+}
+
+.achievement-info {
+  flex: 1;
+  min-width: 0;
+}
+
+.achievement-title {
+  font-size: 13px;
+  font-weight: 600;
+  color: var(--text-primary);
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.achievement-desc {
+  font-size: 11px;
+  color: var(--text-muted);
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.achievement-points {
+  font-size: 13px;
+  font-weight: 700;
+  color: var(--accent);
+  flex-shrink: 0;
+  min-width: 24px;
+  text-align: right;
+}
+
+.achievement-row.earned .achievement-points {
+  color: var(--success, #4ade80);
+}
+
 .platform-tag {
   display: inline-block;
   background: var(--accent);