diff --git a/src/drawline.c b/src/drawline.c
index 1d65f3b4a9..764d0fbaa5 100644
--- a/src/drawline.c
+++ b/src/drawline.c
@@ -2274,7 +2274,7 @@ win_line(
 				}
 
 				if (above)
-				    wlv.vcol_off_tp = vim_strsize(wlv.p_extra);
+				    wlv.vcol_off_tp += vim_strsize(wlv.p_extra);
 
 				if (lcs_eol_one < 0
 					&& wp->w_p_wrap
diff --git a/src/testdir/dumps/Test_prop_multiple_lines_above_1.dump b/src/testdir/dumps/Test_prop_multiple_lines_above_1.dump
new file mode 100644
index 0000000000..be41f74678
--- /dev/null
+++ b/src/testdir/dumps/Test_prop_multiple_lines_above_1.dump
@@ -0,0 +1,16 @@
+| +0#af5f00255#ffffff0@3|a+0#0000001#ffff4012|b|o|v|e|1| +0#0000000#ffffff0@49
+| +0#af5f00255&@3|a+0#0000001#ffff4012|b|o|v|e|2| +0#0000000#ffffff0@49
+| +0#af5f00255&@1|1| |1+0#0000000&@7| | +0&#ffd7d7255| +0&#ffffff0@45
+| +0#af5f00255&@3|a+0#0000001#ffff4012|b|o|v|e|1| +0#0000000#ffffff0@49
+| +0#af5f00255&@3|a+0#0000001#ffff4012|b|o|v|e|2| +0#0000000#ffffff0@49
+| +0#af5f00255&@1|2| | +0#0000000&@8| +0&#ffd7d7255| +0&#ffffff0@45
+| +0#af5f00255&@3|a+0#0000001#ffff4012|b|o|v|e|1| +0#0000000#ffffff0@49
+| +0#af5f00255&@3|a+0#0000001#ffff4012|b|o|v|e|2| +0#0000000#ffffff0@49
+| +0#af5f00255&@1|3| |3+0#0000000&@8| +0&#ffd7d7255| +0&#ffffff0@45
+| +0#af5f00255&@3|a+0#0000001#ffff4012|b|o|v|e|1| +0#0000000#ffffff0@49
+| +0#af5f00255&@3|a+0#0000001#ffff4012|b|o|v|e|2| +0#0000000#ffffff0@49
+| +0#af5f00255&@1|4| | +0#0000000&@8| +0&#ffd7d7255| +0&#ffffff0@45
+| +0#af5f00255&@3|a+0#0000001#ffff4012|b|o|v|e|1| +0#0000000#ffffff0@49
+| +0#af5f00255&@3|a+0#0000001#ffff4012|b|o|v|e|2| +0#0000000#ffffff0@49
+| +0#af5f00255&@1|5| >5+0#0000000&@8|5+0&#ffd7d7255|5+0&#ffffff0| @44
+@42|5|,|1|-|1@1|3| @6|A|l@1| 
diff --git a/src/testdir/test_textprop.vim b/src/testdir/test_textprop.vim
index fe2d2df770..abc63652ec 100644
--- a/src/testdir/test_textprop.vim
+++ b/src/testdir/test_textprop.vim
@@ -3203,6 +3203,28 @@ func Test_prop_with_text_above_below_empty()
   call StopVimInTerminal(buf)
 endfunc
 
+func Test_prop_multiple_lines_above()
+  CheckRunVimInTerminal
+
+  let lines =<< trim END
+      setlocal number colorcolumn=10
+      call setline(1, ['11111111', '', '333333333', '', '55555555555'])
+
+      let vt = 'test'
+      call prop_type_add(vt, {'highlight': 'ToDo'})
+      for ln in range(1, line('$'))
+        call prop_add(ln, 0, {'type': vt, 'text': 'above1', 'text_align': 'above'})
+        call prop_add(ln, 0, {'type': vt, 'text': 'above2', 'text_align': 'above'})
+      endfor
+      normal G
+  END
+  call writefile(lines, 'XscriptPropMultipleLinesAbove', 'D')
+  let buf = RunVimInTerminal('-S XscriptPropMultipleLinesAbove', #{rows: 16, cols: 60})
+  call VerifyScreenDump(buf, 'Test_prop_multiple_lines_above_1', {})
+
+  call StopVimInTerminal(buf)
+endfunc
+
 func Test_prop_with_multibyte_above()
   CheckRunVimInTerminal
 
diff --git a/src/version.c b/src/version.c
index fc9536f268..7e317b3289 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1209,
 /**/
     1208,
 /**/