diff --git a/src/TextHighlighter.js b/src/TextHighlighter.js
index 92496b4..3768a02 100644
--- a/src/TextHighlighter.js
+++ b/src/TextHighlighter.js
@@ -455,6 +455,8 @@
     };
 
     TextHighlighter.prototype.highlightHandler = function () {
+        if (!this.options.enabled) return false;
+
         this.doHighlight();
     };
 
@@ -465,8 +467,6 @@
      */
     TextHighlighter.prototype.doHighlight = function (keepRange) {
 
-        if (!this.options.enabled) return false;
-
         var range = dom(this.el).getRange(),
             wrapper,
             createdHighlights,