diff --git a/src/drawline.c b/src/drawline.c
index b627192..fd5d56b 100644
--- a/src/drawline.c
+++ b/src/drawline.c
@@ -62,7 +62,7 @@
     *left_col = 0;
     *right_col = width1;
 
-    if (wp->w_virtcol >= (colnr_T)width1)
+    if (wp->w_virtcol >= (colnr_T)width1 && width2 > 0)
 	*right_col = width1 + ((wp->w_virtcol - width1) / width2 + 1) * width2;
     if (wp->w_virtcol >= (colnr_T)width1 && width2 > 0)
 	*left_col = (wp->w_virtcol - width1) / width2 * width2 + width1;
diff --git a/src/testdir/test_cursorline.vim b/src/testdir/test_cursorline.vim
index bdde670..d258111 100644
--- a/src/testdir/test_cursorline.vim
+++ b/src/testdir/test_cursorline.vim
@@ -309,6 +309,17 @@
   call StopVimInTerminal(buf)
 endfunc
 
+func Test_cursorline_screenline_zero_width()
+  CheckOption foldcolumn
+
+  set cursorline culopt=screenline winminwidth=1 foldcolumn=1
+  " This used to crash Vim
+  1vnew | redraw
+
+  bwipe!
+  set cursorline& culopt& winminwidth& foldcolumn&
+endfunc
+
 func Test_cursorline_cursorbind_horizontal_scroll()
   CheckScreendump
 
diff --git a/src/version.c b/src/version.c
index c1ee2d5..4f6375b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    730,
+/**/
     729,
 /**/
     728,