diff --git a/index.html b/index.html
index 78afdba..6e71b94 100644
--- a/index.html
+++ b/index.html
@@ -1228,6 +1228,10 @@
                         <h4>Why "Enable Audio" on iPhone?</h4>
                         <p>Apple blocks sound until you tap. Hit the button once and you're good.</p>
                     </div>
+                    <div class="faq-item">
+                        <h4>Ps.</h4>
+                        <p>Built with Claude Code.</p>
+                    </div>
                 </div>
             </main>
         </div>
diff --git a/src/main.ts b/src/main.ts
index 91b0c25..03f2f3b 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -509,8 +509,11 @@ class MotifApp {
       await unlockAudio();
       this.updateIOSAudioBanner();
 
+      // Preserve scroll position during state change
+      const scrollY = window.scrollY;
       // Once generation starts: lock into generated experience mode.
       this.setState('generated');
+      window.scrollTo(0, scrollY);
       this.updateStatus('Generating…');
       this.motifBtn.disabled = true;
       this.playPauseBtn.disabled = true;
@@ -538,7 +541,9 @@ class MotifApp {
       this.updateStatus('');
       this.hasGenerated = true;
       // Refresh generated state now that generation succeeded (enables Copy link, etc.)
+      const scrollYEnd = window.scrollY;
       this.setState('generated');
+      window.scrollTo(0, scrollYEnd);
     } catch (error) {
       this.updateStatus(`Motif error: ${error instanceof Error ? error.message : 'Unknown error'}`);
       this.motifBtn.disabled = false;