diff --git a/fold.c b/fold.c
index a5a987d..9c3c919 100644
--- a/fold.c
+++ b/fold.c
@@ -39,7 +39,9 @@ foldline(struct line *l) {
 				col = 0;
 				break;
 			case '\t':
-				col += (col + 1) % 8;
+				col += (8 - (col % 8));
+				if (col >= width)
+					i--;
 				break;
 			}
 		} else {