diff --git a/src/terminal.c b/src/terminal.c
index 8d05a18..6b16779 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -2952,7 +2952,10 @@
 {
     int i;
 
-ch_log(NULL, "Moving postponed scrollback to scrollback");
+    if (term->tl_scrollback_postponed.ga_len == 0)
+	return;
+    ch_log(NULL, "Moving postponed scrollback to scrollback");
+
     // First remove the lines that were appended before, the pushed lines go
     // above it.
     cleanup_scrollback(term);
diff --git a/src/version.c b/src/version.c
index a49f6fb..18daa06 100644
--- a/src/version.c
+++ b/src/version.c
@@ -780,6 +780,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1018,
+/**/
     1017,
 /**/
     1016,