diff --git a/CHANGELOG.md b/CHANGELOG.md
index ec5963a4..d75c99e2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 - Fixed Bitbucket Cloud pagination not working beyond first page. [#295](https://github.com/sourcebot-dev/sourcebot/issues/295)
+- Fixed search bar line wrapping. [#501](https://github.com/sourcebot-dev/sourcebot/pull/501)
 
 ## [4.6.7] - 2025-09-08
 
diff --git a/packages/web/src/app/[domain]/components/searchBar/searchBar.tsx b/packages/web/src/app/[domain]/components/searchBar/searchBar.tsx
index d6fec7d8..6dbd47cd 100644
--- a/packages/web/src/app/[domain]/components/searchBar/searchBar.tsx
+++ b/packages/web/src/app/[domain]/components/searchBar/searchBar.tsx
@@ -78,8 +78,8 @@ const searchBarContainerVariants = cva(
     {
         variants: {
             size: {
-                default: "h-10",
-                sm: "h-8"
+                default: "min-h-10",
+                sm: "min-h-8"
             }
         },
         defaultVariants: {
@@ -168,6 +168,7 @@ export const SearchBar = ({
             keymap.of(searchBarKeymap),
             history(),
             zoekt(),
+            EditorView.lineWrapping,
             EditorView.updateListener.of(update => {
                 if (update.selectionSet) {
                     const selection = update.state.selection.main;
@@ -259,7 +260,7 @@ export const SearchBar = ({
             />
             <CodeMirror
                 ref={editorRef}
-                className="overflow-x-auto w-full"
+                className="w-full"
                 placeholder={isHistorySearchEnabled ? "Filter history..." : "Search (/) through repos..."}
                 value={query}
                 onChange={(value) => {