diff --git a/debug_orca.png b/debug_orca.png
new file mode 100644
index 000000000..cfb1b432a
Binary files /dev/null and b/debug_orca.png differ
diff --git a/src/renderer/src/assets/main.css b/src/renderer/src/assets/main.css
index 378bb4f5d..fa58b73d4 100644
--- a/src/renderer/src/assets/main.css
+++ b/src/renderer/src/assets/main.css
@@ -861,3 +861,43 @@
   font-size: 12px;
   color: var(--muted-foreground);
 }
+
+/* ── fix: ensure Monaco find widget layout is not reversed ── */
+.monaco-editor .find-widget,
+.monaco-editor .find-widget .monaco-inputbox,
+.monaco-editor .find-widget .matchesCount {
+  direction: ltr !important;
+  flex-direction: row !important;
+}
+
+.monaco-editor .find-widget .button,
+.monaco-editor .find-widget .monaco-button,
+.monaco-editor .find-widget .monaco-find-input .controls .button {
+  display: inline-flex !important;
+  align-items: center !important;
+  justify-content: center !important;
+  padding: 0 !important;
+  width: 20px !important;
+  height: 20px !important;
+  line-height: normal !important;
+  box-sizing: border-box !important;
+  vertical-align: middle !important;
+  border: none !important;
+  box-shadow: none !important;
+  transition: none !important;
+}
+
+/* Specifically for the expand/collapse button icon which is often a nested 'i' or '::before' */
+.monaco-editor .find-widget .button.expand {
+  width: 16px !important;
+  height: 16px !important;
+}
+
+.monaco-editor .find-widget .button > .codicon,
+.monaco-editor .find-widget .button > i {
+  display: flex !important;
+  align-items: center !important;
+  justify-content: center !important;
+  width: 100% !important;
+  height: 100% !important;
+}
diff --git a/src/renderer/src/components/Terminal.tsx b/src/renderer/src/components/Terminal.tsx
index 5ec75ddd4..82d1ae2f3 100644
--- a/src/renderer/src/components/Terminal.tsx
+++ b/src/renderer/src/components/Terminal.tsx
@@ -394,7 +394,7 @@ export default function Terminal(): React.JSX.Element | null {
                     tabId={tab.id}
                     worktreeId={worktree.id}
                     cwd={worktree.path}
-                    isActive={isVisible && tab.id === activeTabId}
+                    isActive={isVisible && tab.id === activeTabId && activeTabType === 'terminal'}
                     onPtyExit={(ptyId) => handlePtyExit(tab.id, ptyId)}
                   />
                 ))}
diff --git a/src/renderer/src/components/editor/DiffSectionItem.tsx b/src/renderer/src/components/editor/DiffSectionItem.tsx
index b9b7b50e3..64265fd29 100644
--- a/src/renderer/src/components/editor/DiffSectionItem.tsx
+++ b/src/renderer/src/components/editor/DiffSectionItem.tsx
@@ -173,7 +173,12 @@ export function DiffSectionItem({
                 automaticLayout: true,
                 renderOverviewRuler: false,
                 scrollbar: { vertical: 'hidden', handleMouseWheel: false },
-                hideUnchangedRegions: { enabled: true }
+                hideUnchangedRegions: { enabled: true },
+                find: {
+                  addExtraSpaceOnTop: false,
+                  autoFindInSelection: 'never',
+                  seedSearchStringFromSelection: 'never'
+                }
               }}
             />
           )}
diff --git a/src/renderer/src/components/editor/DiffViewer.tsx b/src/renderer/src/components/editor/DiffViewer.tsx
index ab8f2d985..35ae5c59d 100644
--- a/src/renderer/src/components/editor/DiffViewer.tsx
+++ b/src/renderer/src/components/editor/DiffViewer.tsx
@@ -77,7 +77,12 @@ export default function DiffViewer({
             lineNumbers: 'on',
             automaticLayout: true,
             renderOverviewRuler: true,
-            padding: { top: 8 }
+            padding: { top: 0 },
+            find: {
+              addExtraSpaceOnTop: false,
+              autoFindInSelection: 'never',
+              seedSearchStringFromSelection: 'never'
+            }
           }}
         />
       </div>
diff --git a/src/renderer/src/components/editor/MonacoEditor.tsx b/src/renderer/src/components/editor/MonacoEditor.tsx
index a3c16164b..9b42db029 100644
--- a/src/renderer/src/components/editor/MonacoEditor.tsx
+++ b/src/renderer/src/components/editor/MonacoEditor.tsx
@@ -169,7 +169,12 @@ export default function MonacoEditor({
           tabSize: 2,
           smoothScrolling: true,
           cursorSmoothCaretAnimation: 'off',
-          padding: { top: 8 }
+          padding: { top: 0 },
+          find: {
+            addExtraSpaceOnTop: false,
+            autoFindInSelection: 'never',
+            seedSearchStringFromSelection: 'never'
+          }
         }}
         path={filePath}
       />