diff --git a/src/drawline.c b/src/drawline.c
index 7d6d4fd..3106196 100644
--- a/src/drawline.c
+++ b/src/drawline.c
@@ -1453,6 +1453,11 @@
 		    }
 		}
 
+# ifdef FEAT_LINEBREAK
+		if (n_extra > 0 && in_linebreak)
+		    // not on the next char yet, don't start another prop
+		    --bcol;
+# endif
 		// Add any text property that starts in this column.
 		while (text_prop_next < text_prop_count
 			   && bcol >= text_props[text_prop_next].tp_col - 1)
diff --git a/src/testdir/dumps/Test_prop_after_linebreak.dump b/src/testdir/dumps/Test_prop_after_linebreak.dump
new file mode 100644
index 0000000..7387c83
--- /dev/null
+++ b/src/testdir/dumps/Test_prop_after_linebreak.dump
@@ -0,0 +1,10 @@
+>x+0&#ffffff0@36|+| @36
+|(+0#ffffff16#e000002|x+0#0000000#ffffff0@36|)| @35
+|~+0#4040ff13&| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+| +0#0000000&@56|1|,|1| @10|A|l@1| 
diff --git a/src/testdir/test_textprop.vim b/src/testdir/test_textprop.vim
index cc5d219..036dd71 100644
--- a/src/testdir/test_textprop.vim
+++ b/src/testdir/test_textprop.vim
@@ -1651,6 +1651,24 @@
   call delete('XscriptPropAfterTab')
 endfunc
 
+func Test_prop_after_linebreak()
+  CheckRunVimInTerminal
+
+  let lines =<< trim END
+      set linebreak wrap
+      call printf('%s+(%s)', 'x'->repeat(&columns / 2), 'x'->repeat(&columns / 2))->setline(1)
+      call prop_type_add('test', #{highlight: 'ErrorMsg'})
+      call prop_add(1, (&columns / 2) + 2, #{length: 1, type: 'test'})
+  END
+  call writefile(lines, 'XscriptPropAfterLinebreak')
+  let buf = RunVimInTerminal('-S XscriptPropAfterLinebreak', #{rows: 10})
+  call TermWait(buf)
+  call VerifyScreenDump(buf, 'Test_prop_after_linebreak', {})
+
+  call StopVimInTerminal(buf)
+  call delete('XscriptPropAfterLinebreak')
+endfunc
+
 " Buffer number of 0 should be ignored, as if the parameter wasn't passed.
 def Test_prop_bufnr_zero()
   new
diff --git a/src/version.c b/src/version.c
index 0ae4d63..1c3f4c2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    3723,
+/**/
     3722,
 /**/
     3721,