diff --git a/client/components/codeEditor/codeEditor.jsx b/client/components/codeEditor/codeEditor.jsx
index 098c03281..4391ff7f7 100644
--- a/client/components/codeEditor/codeEditor.jsx
+++ b/client/components/codeEditor/codeEditor.jsx
@@ -19,6 +19,7 @@ import { languages } from '@codemirror/language-data';
 import { css } from '@codemirror/lang-css';
 import { markdown, markdownLanguage } from '@codemirror/lang-markdown';
 import { autocompleteEmoji } from './autocompleteEmoji.js';
+import { searchKeymap, highlightSelectionMatches, search, openSearchPanel } from '@codemirror/search';
 
 import * as themes from '@uiw/codemirror-themes-all';
 const themeCompartment = new Compartment();
@@ -139,8 +140,7 @@ const CodeEditor = forwardRef(
 
 			return [
 				history(),
-				keymap.of(defaultKeymap),
-				customKeymap,
+				keymap.of([...defaultKeymap, customKeymap, foldKeymap, ...searchKeymap]),
 				updateListener,
 				EditorView.lineWrapping,
 				scrollPastEnd(),
@@ -150,7 +150,6 @@ const CodeEditor = forwardRef(
 				homebreweryFold,
 				hbFolding,
 
-				keymap.of(foldKeymap),
 				foldGutter({
 					openText   : '▾',
 					closedText : '▸'
@@ -161,6 +160,7 @@ const CodeEditor = forwardRef(
 				highlightActiveLineGutter(),
 				highlightCompartment.of(combinedHighlight),
 				autocompleteEmoji,
+				search(),
 			];
 		};
 
diff --git a/package-lock.json b/package-lock.json
index 3330f5094..0a461307a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -23,6 +23,7 @@
         "@codemirror/lang-markdown": "^6.5.0",
         "@codemirror/language": "^6.12.2",
         "@codemirror/language-data": "^6.5.2",
+        "@codemirror/search": "^6.6.0",
         "@codemirror/state": "^6.6.0",
         "@codemirror/view": "^6.40.0",
         "@dmsnell/diff-match-patch": "^1.1.0",
@@ -2500,6 +2501,17 @@
         "@codemirror/text": "^0.19.0"
       }
     },
+    "node_modules/@codemirror/search": {
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.6.0.tgz",
+      "integrity": "sha512-koFuNXcDvyyotWcgOnZGmY7LZqEOXZaaxD/j6n18TCLx2/9HieZJ5H6hs1g8FiRxBD0DNfs0nXn17g872RmYdw==",
+      "license": "MIT",
+      "dependencies": {
+        "@codemirror/state": "^6.0.0",
+        "@codemirror/view": "^6.37.0",
+        "crelt": "^1.0.5"
+      }
+    },
     "node_modules/@codemirror/state": {
       "version": "6.6.0",
       "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.6.0.tgz",
diff --git a/package.json b/package.json
index 86bfd4527..5260bfb4f 100644
--- a/package.json
+++ b/package.json
@@ -99,6 +99,7 @@
     "@codemirror/lang-markdown": "^6.5.0",
     "@codemirror/language": "^6.12.2",
     "@codemirror/language-data": "^6.5.2",
+    "@codemirror/search": "^6.6.0",
     "@codemirror/state": "^6.6.0",
     "@codemirror/view": "^6.40.0",
     "@dmsnell/diff-match-patch": "^1.1.0",