diff --git a/desktop/src/pages/ActivitySettings.test.tsx b/desktop/src/pages/ActivitySettings.test.tsx
index b2dcb1bd..c5c67a87 100644
--- a/desktop/src/pages/ActivitySettings.test.tsx
+++ b/desktop/src/pages/ActivitySettings.test.tsx
@@ -227,6 +227,18 @@ describe('ActivitySettings', () => {
     expect(screen.queryByText('Selected day')).not.toBeInTheDocument()
   })
 
+  it('keeps the profile edit control out of screenshots until hover or keyboard focus', async () => {
+    render(<ActivitySettings />)
+
+    await flushActivityLoad()
+
+    const editButton = screen.getByRole('button', { name: 'Edit profile' })
+    expect(editButton).toHaveClass('opacity-0')
+    expect(editButton).toHaveClass('group-hover/activity-profile:opacity-100')
+    expect(editButton).toHaveClass('focus-visible:opacity-100')
+    expect(editButton.closest('div')).toHaveClass('group/activity-profile')
+  })
+
   it('supports localized heatmap mode switches and persisted display name edits', async () => {
     useSettingsStore.setState({ locale: 'zh' })
     render(<ActivitySettings />)
diff --git a/desktop/src/pages/ActivitySettings.tsx b/desktop/src/pages/ActivitySettings.tsx
index 47c77223..a6b4b235 100644
--- a/desktop/src/pages/ActivitySettings.tsx
+++ b/desktop/src/pages/ActivitySettings.tsx
@@ -573,13 +573,13 @@ export function ActivitySettings() {
             }}
           />
         </div>
-        <div className="mt-6 flex max-w-full items-center justify-center gap-2">
+        <div className="group/activity-profile mt-6 flex max-w-full items-center justify-center gap-2">
           <h1 className="max-w-[min(720px,calc(100%-2.25rem))] truncate text-4xl font-semibold tracking-tight text-[var(--color-text-primary)] sm:text-[44px]">{profile.displayName}</h1>
           <button
             type="button"
             aria-label={t('settings.activity.editProfile')}
             title={t('settings.activity.editProfile')}
-            className="mt-1 inline-flex h-7 w-7 shrink-0 items-center justify-center rounded-md text-[var(--color-text-tertiary)] transition-[background-color,color,transform] hover:bg-[var(--color-surface-hover)] hover:text-[var(--color-text-primary)] focus:outline-none focus:ring-2 focus:ring-[var(--color-brand)] focus:ring-offset-2 focus:ring-offset-[var(--color-surface)] active:translate-y-[1px] disabled:opacity-50"
+            className="mt-1 inline-flex h-7 w-7 shrink-0 items-center justify-center rounded-md text-[var(--color-text-tertiary)] opacity-0 transition-[background-color,color,opacity,transform] group-hover/activity-profile:opacity-100 hover:bg-[var(--color-surface-hover)] hover:text-[var(--color-text-primary)] focus:outline-none focus:ring-2 focus:ring-[var(--color-brand)] focus:ring-offset-2 focus:ring-offset-[var(--color-surface)] focus-visible:opacity-100 active:translate-y-[1px] disabled:pointer-events-none disabled:opacity-0"
             onClick={() => {
               setIsEditingProfile(true)
               setDraftDisplayName(profile.displayName)