diff --git a/web/ui/react-app/src/App.css b/web/ui/react-app/src/App.css
index b1f54660a..cf0cf9406 100644
--- a/web/ui/react-app/src/App.css
+++ b/web/ui/react-app/src/App.css
@@ -32,8 +32,11 @@ input[type='checkbox']:checked + label {
   text-transform: capitalize;
 }
 
-.expression-input {
+/* Using a more specific selector here to be able to override Bootstrap's default input group styles. */
+.input-group.expression-input {
   margin-bottom: 10px;
+  /* Prevent the input group from wrapping around when the editor content is too long for a line. */
+  flex-wrap: nowrap;
 }
 
 .expression-input .cm-expression-input {
diff --git a/web/ui/react-app/src/pages/graph/CMExpressionInput.tsx b/web/ui/react-app/src/pages/graph/CMExpressionInput.tsx
index ab9de6d36..12655dc29 100644
--- a/web/ui/react-app/src/pages/graph/CMExpressionInput.tsx
+++ b/web/ui/react-app/src/pages/graph/CMExpressionInput.tsx
@@ -128,6 +128,7 @@ const CMExpressionInput: FC<CMExpressionInputProps> = ({
           closeBrackets(),
           autocompletion(),
           highlightSelectionMatches(),
+          EditorView.lineWrapping,
           keymap.of([
             ...closeBracketsKeymap,
             ...defaultKeymap,