1 files changed, 6 insertions, 2 deletions
diff --git a/src/screen.c b/src/screen.c
index 6ddd84259..82621a3c4 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -2763,10 +2763,14 @@ fold_line(
     /*
      * 3. Add the 'number' or 'relativenumber' column
      */
-    if (wp->w_p_nu || wp->w_p_rnu)
+    if (wp->w_p_nu
+#ifdef FEAT_LINEBREAK
+	    || wp->w_p_rnu
+#endif
+	    )
     {
 	len = wp->w_width - col;
-	if (len > 0)
+	if (len > 0 && wp->w_p_nuw > 0)
 	{
 	    int	    w = number_width(wp);
 	    long    num;