diff --git a/src/text-editor-component.js b/src/text-editor-component.js
index ce923bbdb..e72ae4a65 100644
--- a/src/text-editor-component.js
+++ b/src/text-editor-component.js
@@ -449,8 +449,11 @@ class TextEditorComponent {
       }
     }
 
+    startRow = Math.max(startRow, this.getRenderedStartRow())
+    endRow = Math.min(endRow, this.getRenderedEndRow() - 1)
+
     for (let row = startRow; row <= endRow; row++) {
-      if (omitLastRow && row === endRow) break
+      if (omitLastRow && row === screenRange.end.row) break
       const currentClassName = decorationsByRow.get(row)
       const newClassName = currentClassName ? currentClassName + ' ' + decoration.class : decoration.class
       decorationsByRow.set(row, newClassName)