diff --git a/edit/editdraw.c b/edit/editdraw.c
index fbafdc248..40f2f306b 100644
--- a/edit/editdraw.c
+++ b/edit/editdraw.c
@@ -398,10 +398,13 @@ edit_draw_this_line (WEdit *edit, long b, long row, long start_col,
 		    i = TAB_SIZE - ((int) col % TAB_SIZE);
 		    col += i;
 		    if (use_colors && visible_tabs) {
-			c = (p->style & ~MOD_CURSOR) | MOD_WHITESPACE;
+			if (p->style & MOD_MARKED)
+			    c = (p->style);
+			else
+			    c = p->style | MOD_WHITESPACE;
 			if (i > 2) {
 			    p->ch = '<';
-			    p->style |= MOD_WHITESPACE;
+			    p->style = c;
 			    p++;
 			    while (--i > 1) {
 				p->ch = '-';
@@ -413,14 +416,14 @@ edit_draw_this_line (WEdit *edit, long b, long row, long start_col,
 			    p++;
 			} else if (i > 1) {
 			    p->ch = '<';
-			    p->style |= MOD_WHITESPACE;
+			    p->style = c;
 			    p++;
 			    p->ch = '>';
 			    p->style = c;
 			    p++;
 			} else {
 			    p->ch = '>';
-			    p->style |= MOD_WHITESPACE;
+			    p->style = c;
 			    p++;
 			}
 		    } else if (use_colors && visible_tws && q >= tws) {