diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0f3a0179..68b15356 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -61,6 +61,9 @@
 ### Deprecated
 ### Removed
 ### Fixed
+
+* Crash when printing double-width (or longer) characters to, or near,
+  the last column, when auto-wrap (private mode 7) has been disabled.
 ### Security
 ### Contributors
 
diff --git a/terminal.c b/terminal.c
index deb9ba81..e747009a 100644
--- a/terminal.c
+++ b/terminal.c
@@ -3680,11 +3680,13 @@ term_print(struct terminal *term, char32_t wc, int width)
         grid_row_uri_range_erase(row, col, col + width - 1);
 
     /* Advance cursor the 'additional' columns while dirty:ing the cells */
-    for (int i = 1; i < width && col < term->cols; i++) {
+    for (int i = 1; i < width && (col + 1) < term->cols; i++) {
         col++;
         print_spacer(term, col, width - i);
     }
 
+    xassert(col < term->cols);
+
     /* Advance cursor */
     if (unlikely(++col >= term->cols)) {
         grid->cursor.lcf = true;
@@ -3726,6 +3728,7 @@ ascii_printer_fast(struct terminal *term, char32_t wc)
 
     /* Advance cursor */
     if (unlikely(++col >= term->cols)) {
+        xassert(col == term->cols);
         grid->cursor.lcf = true;
         col--;
     } else