1 files changed, 6 insertions, 1 deletions
diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index 2e64eb864f..f034ac33f1 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -309,6 +309,9 @@ void update_screen(int type)
         if (wp->w_winrow + wp->w_height + wp->w_status_height > valid) {
           wp->w_redr_status = true;
         }
+        if (valid == 0) {
+          redraw_tabline = true;
+        }
       }
     } else if (msg_scrolled > Rows - 5) {  // clearing is faster
       type = CLEAR;
@@ -5307,7 +5310,9 @@ void screen_getbytes(int row, int col, char_u *bytes, int *attrp)
     bytes[0] = ScreenLines[off];
     bytes[1] = NUL;
 
-    bytes[utfc_char2bytes(off, bytes)] = NUL;
+    if (ScreenLinesUC[off] != 0) {
+      bytes[utfc_char2bytes(off, bytes)] = NUL;
+    }
   }
 }