diff --git a/common/lbuf.c b/common/lbuf.c
index 4618b94b5..3b20323fc 100644
--- a/common/lbuf.c
+++ b/common/lbuf.c
@@ -247,8 +247,12 @@ lbuf_print(struct lbuf *lbuf)
     /* For very small widths just give up... */
     len = lbuf->continuation ? strlen(lbuf->continuation) : 0;
     if (lbuf->cols <= lbuf->indent + len + 20) {
-	lbuf->buf[lbuf->len] = '\0';
-	lbuf->output(lbuf->buf);
+	if (lbuf->len > 0) {
+	    lbuf->buf[lbuf->len] = '\0';
+	    lbuf->output(lbuf->buf);
+	    if (lbuf->buf[lbuf->len - 1] != '\n')
+		lbuf->output("\n");
+	}
 	goto done;
     }