diff --git a/src/renderer/src/components/sidebar/WorktreeCardMeta.test.tsx b/src/renderer/src/components/sidebar/WorktreeCardMeta.test.tsx
index 02851b42c34..47e07d0c734 100644
--- a/src/renderer/src/components/sidebar/WorktreeCardMeta.test.tsx
+++ b/src/renderer/src/components/sidebar/WorktreeCardMeta.test.tsx
@@ -94,6 +94,36 @@ describe('WorktreeCardDetailsHover', () => {
     expect(markup).not.toContain('aria-label="Unlink PR"')
   })
 
+  it('puts issue edit before open actions and keeps GitHub last', () => {
+    const markup = renderToStaticMarkup(
+      <WorktreeCardDetailsHover
+        issue={{
+          number: 5518,
+          title: 'Agent monitor lists ephemeral headless subprocesses',
+          state: 'closed',
+          url: 'https://github.com/acme/orca/issues/5518',
+          labels: []
+        }}
+        linearIssue={null}
+        review={null}
+        comment={null}
+        onEditIssue={vi.fn()}
+        onEditComment={vi.fn()}
+        onOpenGitHubIssueInOrca={vi.fn()}
+      >
+        <span>Linked issue</span>
+      </WorktreeCardDetailsHover>
+    )
+
+    const editIssueIndex = markup.indexOf('aria-label="Edit issue"')
+    const openInOrcaIndex = markup.indexOf('aria-label="Open in Orca"')
+    const viewOnGitHubIndex = markup.indexOf('aria-label="View on GitHub"')
+
+    expect(editIssueIndex).toBeGreaterThan(-1)
+    expect(editIssueIndex).toBeLessThan(openInOrcaIndex)
+    expect(openInOrcaIndex).toBeLessThan(viewOnGitHubIndex)
+  })
+
   it('labels GitLab unlink actions with MR terminology', () => {
     const markup = renderToStaticMarkup(
       <WorktreeCardDetailsHover
diff --git a/src/renderer/src/components/sidebar/WorktreeCardMeta.tsx b/src/renderer/src/components/sidebar/WorktreeCardMeta.tsx
index 291f87478a8..2f685d6efc0 100644
--- a/src/renderer/src/components/sidebar/WorktreeCardMeta.tsx
+++ b/src/renderer/src/components/sidebar/WorktreeCardMeta.tsx
@@ -209,6 +209,17 @@ export function WorktreeCardDetailsHover({
                 )}
                 actions={
                   <>
+                    {onEditIssue && (
+                      <MetadataActionIcon
+                        label={translate(
+                          'auto.components.sidebar.WorktreeCardMeta.807b13b9ec',
+                          'Edit issue'
+                        )}
+                        onClick={onEditIssue}
+                      >
+                        <Pencil className="size-3" />
+                      </MetadataActionIcon>
+                    )}
                     {issue.url && onOpenGitHubIssueInOrca && (
                       <MetadataActionIcon
                         label={translate(
@@ -231,17 +242,6 @@ export function WorktreeCardDetailsHover({
                         <ExternalLink className="size-3" />
                       </MetadataActionIcon>
                     )}
-                    {onEditIssue && (
-                      <MetadataActionIcon
-                        label={translate(
-                          'auto.components.sidebar.WorktreeCardMeta.807b13b9ec',
-                          'Edit issue'
-                        )}
-                        onClick={onEditIssue}
-                      >
-                        <Pencil className="size-3" />
-                      </MetadataActionIcon>
-                    )}
                   </>
                 }
               />