diff --git a/lib/mixins/canvas-drawer.coffee b/lib/mixins/canvas-drawer.coffee
index aa22f2a3..82d678fa 100644
--- a/lib/mixins/canvas-drawer.coffee
+++ b/lib/mixins/canvas-drawer.coffee
@@ -181,6 +181,8 @@ class CanvasDrawer extends Mixin
         else
           x += w * charWidth
 
+        break if x > canvasWidth
+
       # Finally the highlight over decorations are drawn.
       highlightDecorations = @minimap.decorationsByTypesForRow(firstRow + row, 'highlight', 'highlight-over', decorations)
       for decoration in highlightDecorations