diff --git a/cmd/micro/cellview.go b/cmd/micro/cellview.go
index b4874ee5..f329ef78 100644
--- a/cmd/micro/cellview.go
+++ b/cmd/micro/cellview.go
@@ -118,11 +118,9 @@ func (c *CellView) Draw(buf *Buffer, top, height, left, width int) {
 			if char == '\t' {
 				if viewCol >= 0 {
 					c.lines[viewLine][viewCol].drawChar = indentchar
-					viewCol += tabsize - viewCol%tabsize
-				} else {
-					viewCol += tabsize
 				}
-				// viewCol += tabsize
+
+				viewCol += tabsize - (viewCol+left)%tabsize
 			} else if runewidth.RuneWidth(char) > 1 {
 				viewCol += runewidth.RuneWidth(char)
 			} else {