diff --git a/CHANGELOG.md b/CHANGELOG.md
index 30639adb..01df8b1e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -101,6 +101,7 @@
 * `LF` now always clears `LCF`. Previously, it only cleared it when
   the cursor was **not** at the bottom of the scrolling region.
 * `IND` and `RI` now clears `LCF`.
+* `DECAWM` not clears `LCF`.
 
 
 ### Security
diff --git a/csi.c b/csi.c
index 9ace5177..fc6db974 100644
--- a/csi.c
+++ b/csi.c
@@ -1030,7 +1030,9 @@ csi_dispatch(struct terminal *term, uint8_t final)
                 }
 
                 case 7:
+                    /* DECAWM */
                     term->auto_margin = true;
+                    term->grid->cursor.lcf = false;
                     break;
 
                 case 9:
@@ -1175,7 +1177,9 @@ csi_dispatch(struct terminal *term, uint8_t final)
                 }
 
                 case 7:
+                    /* DECAWM */
                     term->auto_margin = false;
+                    term->grid->cursor.lcf = false;
                     break;
 
                 case 12: