diff --git a/src/screen.c b/src/screen.c
index 05639c3..d2227a8 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -4391,6 +4391,9 @@
 		int pi;
 		int bcol = (int)(ptr - line);
 
+		if (n_extra > 0)
+		    --bcol;  // still working on the previous char, e.g. Tab
+
 		// Check if any active property ends.
 		for (pi = 0; pi < text_props_active; ++pi)
 		{
diff --git a/src/testdir/dumps/Test_textprop_tab.dump b/src/testdir/dumps/Test_textprop_tab.dump
new file mode 100644
index 0000000..a1b7705
--- /dev/null
+++ b/src/testdir/dumps/Test_textprop_tab.dump
@@ -0,0 +1,6 @@
+| +0&#ffffff0@6> |x+0&#ffff4012@2| +0&#ffffff0@63
+|x| @6|x+0&#ffff4012@2| +0&#ffffff0@63
+|~+0#4040ff13&| @73
+|~| @73
+|~| @73
+| +0#0000000&@56|1|,|1|-|8| @8|A|l@1| 
diff --git a/src/testdir/test_textprop.vim b/src/testdir/test_textprop.vim
index 08c079c..36eeb70 100644
--- a/src/testdir/test_textprop.vim
+++ b/src/testdir/test_textprop.vim
@@ -759,6 +759,26 @@
   call RunTestVisualBlock(4, '02')
 endfunc
 
+func Test_textprop_after_tab()
+  let lines =<< trim END
+       call setline(1, [
+             \ "\txxx",
+             \ "x\txxx",
+             \ ])
+       hi SearchProp ctermbg=yellow
+       call prop_type_add('search', {'highlight': 'SearchProp'})
+       call prop_add(1, 2, {'length': 3, 'type': 'search'})
+       call prop_add(2, 3, {'length': 3, 'type': 'search'})
+  END
+  call writefile(lines, 'XtestPropTab')
+  let buf = RunVimInTerminal('-S XtestPropTab', {'rows': 6})
+  call VerifyScreenDump(buf, 'Test_textprop_tab', {})
+
+  " clean up
+  call StopVimInTerminal(buf)
+  call delete('XtestPropTab')
+endfunc
+
 " Adding a text property to a new buffer should not fail
 func Test_textprop_empty_buffer()
   call prop_type_add('comment', {'highlight': 'Search'})
diff --git a/src/version.c b/src/version.c
index d71b86e..19b6aa7 100644
--- a/src/version.c
+++ b/src/version.c
@@ -778,6 +778,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1571,
+/**/
     1570,
 /**/
     1569,