diff --git a/cmd/micro/cellview.go b/cmd/micro/cellview.go
index c97c1056..6d38e8bf 100644
--- a/cmd/micro/cellview.go
+++ b/cmd/micro/cellview.go
@@ -66,9 +66,9 @@ func (c *CellView) Draw(buf *Buffer, top, height, left, width int) {
 		}
 
 		buf.highlighter.ReHighlightStates(buf, start)
-	}
 
-	buf.highlighter.HighlightMatches(buf, top, top+height)
+		buf.highlighter.HighlightMatches(buf, top, top+height)
+	}
 
 	c.lines = make([][]*Char, 0)