diff --git a/src/normal.cc b/src/normal.cc
index e45733c802..f1be2e3db6 100644
--- a/src/normal.cc
+++ b/src/normal.cc
@@ -2077,6 +2077,10 @@ void clear_selections(Context& context, NormalParams)
 
 void flip_selections(Context& context, NormalParams)
 {
+    if (context.is_line_editing()) {
+        context.enter_or_keep_line_editing();
+    }
+
     for (auto& sel : context.selections())
     {
         const BufferCoord tmp = sel.anchor();
@@ -2088,6 +2092,10 @@ void flip_selections(Context& context, NormalParams)
 
 void ensure_forward(Context& context, NormalParams)
 {
+    if (context.is_line_editing()) {
+        context.enter_or_keep_line_editing();
+    }
+
     for (auto& sel : context.selections())
     {
         const BufferCoord min = sel.min(), max = sel.max();