diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml
index b6ab60320149..5340e4a1e39c 100644
--- a/modules/libpref/init/StaticPrefList.yaml
+++ b/modules/libpref/init/StaticPrefList.yaml
@@ -697,7 +697,11 @@
 # 2 = visual, but logical during selection
 - name: bidi.edit.caret_movement_style
   type: int32_t
-  value: 2
+#if !defined(XP_LINUX) && defined(NIGHTLY_BUILD)
+  value: 1
+#else
+  value: 2 # See Bug 1638240
+#endif
   mirror: always
 
 #---------------------------------------------------------------------------