diff --git a/sass/base.scss b/sass/base.scss
index c69d75cc0..9c1fa8c1b 100644
--- a/sass/base.scss
+++ b/sass/base.scss
@@ -39,3 +39,7 @@ button {
     /* override transition for instant hover response */
     transition: color 0.15s ease-in-out, box-shadow 0.15s ease-in-out !important;
 }
+
+pre, code, kbd, samp {
+    unicode-bidi: normal !important;
+}
diff --git a/ts/editor/CodeMirror.svelte b/ts/editor/CodeMirror.svelte
index 4073ae2ca..0f376bba0 100644
--- a/ts/editor/CodeMirror.svelte
+++ b/ts/editor/CodeMirror.svelte
@@ -11,14 +11,22 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 </script>
 
 <script lang="typescript">
-    import { createEventDispatcher } from "svelte";
+    import { createEventDispatcher, getContext } from "svelte";
     import type { Writable } from "svelte/store";
     import storeSubscribe from "../sveltelib/store-subscribe";
+    import { directionKey } from "../lib/context-keys";
 
     export let configuration: CodeMirror.EditorConfiguration;
     export let code: Writable<string>;
 
+    const direction = getContext<Writable<"ltr" | "rtl">>(directionKey);
+    const defaultConfiguration = {
+        direction: $direction,
+        rtlMoveVisually: true,
+    };
+
     let codeMirror: CodeMirror.EditorFromTextArea;
+    $: codeMirror?.setOption("direction", $direction);
 
     function setValue(content: string): void {
         codeMirror.setValue(content);
@@ -28,7 +36,10 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     const dispatch = createEventDispatcher();
 
     function openCodeMirror(textarea: HTMLTextAreaElement): void {
-        codeMirror = CodeMirrorLib.fromTextArea(textarea, configuration);
+        codeMirror = CodeMirrorLib.fromTextArea(textarea, {
+            ...defaultConfiguration,
+            ...configuration,
+        });
 
         // TODO passing in the tabindex option does not do anything: bug?
         codeMirror.getInputField().tabIndex = 0;