diff --git a/web/components/admin/EditCustomJavascript.tsx b/web/components/admin/EditCustomJavascript.tsx
index 7b54f8e9e..565b4783b 100644
--- a/web/components/admin/EditCustomJavascript.tsx
+++ b/web/components/admin/EditCustomJavascript.tsx
@@ -1,6 +1,6 @@
 import React, { useState, useEffect, useContext, FC } from 'react';
 import { Typography, Button } from 'antd';
-import CodeMirror from '@uiw/react-codemirror';
+import CodeMirror, { EditorView } from '@uiw/react-codemirror';
 import { bbedit } from '@uiw/codemirror-theme-bbedit';
 import { javascript } from '@codemirror/lang-javascript';
 
@@ -98,7 +98,7 @@ export const EditCustomJavascript: FC = () => {
         placeholder="/* Enter custom Javascript here */"
         theme={bbedit}
         height="200px"
-        extensions={[javascript()]}
+        extensions={[javascript(), EditorView.lineWrapping]}
         onChange={onValueChange}
       />
 
diff --git a/web/components/admin/EditCustomStyles.tsx b/web/components/admin/EditCustomStyles.tsx
index d9e5f3947..9556b05f1 100644
--- a/web/components/admin/EditCustomStyles.tsx
+++ b/web/components/admin/EditCustomStyles.tsx
@@ -1,7 +1,7 @@
 // EDIT CUSTOM CSS STYLES
 import React, { useState, useEffect, useContext, FC } from 'react';
 import { Typography, Button } from 'antd';
-import CodeMirror from '@uiw/react-codemirror';
+import CodeMirror, { EditorView } from '@uiw/react-codemirror';
 import { bbedit } from '@uiw/codemirror-theme-bbedit';
 import { css } from '@codemirror/lang-css';
 
@@ -101,7 +101,7 @@ export const EditCustomStyles: FC = () => {
         placeholder="/* Enter custom CSS here */"
         theme={bbedit}
         height="200px"
-        extensions={[css()]}
+        extensions={[css(), EditorView.lineWrapping]}
         onChange={onCSSValueChange}
       />
 
diff --git a/web/components/admin/config/general/EditInstanceDetails.tsx b/web/components/admin/config/general/EditInstanceDetails.tsx
index 642846d38..0545d04ea 100644
--- a/web/components/admin/config/general/EditInstanceDetails.tsx
+++ b/web/components/admin/config/general/EditInstanceDetails.tsx
@@ -1,7 +1,7 @@
 import React, { useState, useContext, useEffect, FC } from 'react';
 import { Button, Modal, Typography } from 'antd';
 import { markdown, markdownLanguage } from '@codemirror/lang-markdown';
-import CodeMirror from '@uiw/react-codemirror';
+import CodeMirror, { EditorView } from '@uiw/react-codemirror';
 import { bbedit } from '@uiw/codemirror-theme-bbedit';
 import { languages } from '@codemirror/language-data';
 import {
@@ -241,7 +241,7 @@ export default function EditInstanceDetails() {
             onChange={value => {
               handleFieldChange({ fieldName: 'offlineMessage', value });
             }}
-            extensions={[markdown({ base: markdownLanguage, codeLanguages: languages })]}
+            extensions={[markdown({ base: markdownLanguage, codeLanguages: languages }), EditorView.lineWrapping]}
           />
         </div>
         <div className="field-tip">
diff --git a/web/components/admin/config/general/EditPageContent.tsx b/web/components/admin/config/general/EditPageContent.tsx
index 8275f302b..e101619d2 100644
--- a/web/components/admin/config/general/EditPageContent.tsx
+++ b/web/components/admin/config/general/EditPageContent.tsx
@@ -1,7 +1,7 @@
 // EDIT CUSTOM DETAILS ON YOUR PAGE
 import React, { useState, useEffect, useContext } from 'react';
 import { Typography, Button } from 'antd';
-import CodeMirror from '@uiw/react-codemirror';
+import CodeMirror, { EditorView } from '@uiw/react-codemirror';
 import { bbedit } from '@uiw/codemirror-theme-bbedit';
 import { markdown, markdownLanguage } from '@codemirror/lang-markdown';
 import { languages } from '@codemirror/language-data';
@@ -103,7 +103,7 @@ export default function EditPageContent() {
         theme={bbedit}
         height="200px"
         onChange={handleEditorChange}
-        extensions={[markdown({ base: markdownLanguage, codeLanguages: languages })]}
+        extensions={[markdown({ base: markdownLanguage, codeLanguages: languages }), EditorView.lineWrapping]}
       />
 
       <br />