diff --git a/src/winio.c b/src/winio.c
index 25d1df3b..7b32448e 100644
--- a/src/winio.c
+++ b/src/winio.c
@@ -2481,8 +2481,8 @@ void edit_draw(filestruct *fileptr, const char *converted,
 		/* Begin searching for an end after the start match. */
 		index += startmatch.rm_eo;
 		/* If there is no end after this last start, good. */
-		if (regexec(varnish->end, start_line->data + index,
-				1, &endmatch, REG_NOTBOL) == REG_NOMATCH)
+		if (regexec(varnish->end, start_line->data + index, 1, &endmatch,
+				(index == 0) ? 0 : REG_NOTBOL) == REG_NOMATCH)
 		    break;
 		/* Begin searching for a new start after the end match. */
 		index += endmatch.rm_eo;