diff --git a/app/editor/extensions/FindAndReplace.tsx b/app/editor/extensions/FindAndReplace.tsx
index 29721ab420..d82fa7a3e6 100644
--- a/app/editor/extensions/FindAndReplace.tsx
+++ b/app/editor/extensions/FindAndReplace.tsx
@@ -163,6 +163,7 @@ export default class FindAndReplaceExtension extends Extension<FindAndReplaceOpt
 
       dispatch?.(state.tr.setMeta(pluginKey, {}));
       this.expandFoldedTogglesForCurrentMatch();
+      this.expandCollapsedCodeBlockForCurrentMatch();
       this.scrollToCurrentMatch();
 
       return true;
@@ -213,6 +214,7 @@ export default class FindAndReplaceExtension extends Extension<FindAndReplaceOpt
 
       dispatch?.(state.tr.setMeta(pluginKey, {}));
       this.expandFoldedTogglesForCurrentMatch();
+      this.expandCollapsedCodeBlockForCurrentMatch();
       this.scrollToCurrentMatch();
       return true;
     };
@@ -298,6 +300,18 @@ export default class FindAndReplaceExtension extends Extension<FindAndReplaceOpt
     });
   }
 
+  /**
+   * Expand a collapsed code block if it contains the current match.
+   */
+  private expandCollapsedCodeBlockForCurrentMatch() {
+    const result = this.results[this.currentResultIndex];
+    if (!result) {
+      return;
+    }
+
+    this.editor.commands.expandCodeBlockAt(result.from);
+  }
+
   private rebaseNextResult(replace: string, index: number, lastOffset = 0) {
     const nextIndex = index + 1;
 
diff --git a/shared/editor/nodes/CodeFence.ts b/shared/editor/nodes/CodeFence.ts
index ae99076016..68de028c39 100644
--- a/shared/editor/nodes/CodeFence.ts
+++ b/shared/editor/nodes/CodeFence.ts
@@ -244,6 +244,29 @@ export default class CodeFence extends Node<CodeFenceOptions> {
           ...attrs,
         });
       },
+      expandCodeBlockAt:
+        (pos: number): Command =>
+        (state, dispatch) => {
+          const $pos = state.doc.resolve(pos);
+          const codeBlock = findParentNodeClosestToPos($pos, isCode);
+          if (!codeBlock) {
+            return false;
+          }
+
+          const collapseState = CodeFence.collapseKey.getState(state);
+          if (!collapseState?.collapsedBlocks.has(codeBlock.pos)) {
+            return false;
+          }
+
+          if (dispatch) {
+            dispatch(
+              state.tr
+                .setMeta(CodeFence.collapseKey, { expand: codeBlock.pos })
+                .setMeta("addToHistory", false)
+            );
+          }
+          return true;
+        },
       toggleCodeBlockCollapse: (): Command => (state, dispatch) => {
         const codeBlock = findParentNode(isCode)(state.selection);
         if (!codeBlock) {