diff --git a/src/annotations/gutterBlameAnnotationProvider.ts b/src/annotations/gutterBlameAnnotationProvider.ts
index c311f09..7816293 100644
--- a/src/annotations/gutterBlameAnnotationProvider.ts
+++ b/src/annotations/gutterBlameAnnotationProvider.ts
@@ -62,8 +62,8 @@ export class GutterBlameAnnotationProvider extends BlameAnnotationProviderBase {
                     compacted = true;
                 }
 
-                // const firstNonWhitespace = document.lineAt(line).firstNonWhitespaceCharacterIndex;
-                gutter.range = new Range(line, 0, line, 0); // document.validateRange(new Range(line, 0, line, firstNonWhitespace));
+                const endIndex = document.lineAt(line).firstNonWhitespaceCharacterIndex;
+                gutter.range = new Range(line, 0, line, endIndex);
                 decorations.push(gutter);
 
                 if (details !== undefined) {
@@ -93,8 +93,8 @@ export class GutterBlameAnnotationProvider extends BlameAnnotationProviderBase {
                 Annotations.applyHeatmap(gutter, commit.date, now);
             }
 
-            // const firstNonWhitespace = document.lineAt(line).firstNonWhitespaceCharacterIndex;
-            gutter.range = new Range(line, 0, line, 0); // document.validateRange(new Range(line, 0, line, firstNonWhitespace));
+            const endIndex = document.lineAt(line).firstNonWhitespaceCharacterIndex;
+            gutter.range = new Range(line, 0, line, endIndex);
             decorations.push(gutter);
 
             if (cfg.hover.details) {
diff --git a/src/annotations/hoverBlameAnnotationProvider.ts b/src/annotations/hoverBlameAnnotationProvider.ts
index ace42fc..d4171f9 100644
--- a/src/annotations/hoverBlameAnnotationProvider.ts
+++ b/src/annotations/hoverBlameAnnotationProvider.ts
@@ -24,6 +24,7 @@ export class HoverBlameAnnotationProvider extends BlameAnnotationProviderBase {
         const dateFormat = this._config.defaultDateFormat;
 
         const decorations: DecorationOptions[] = [];
+        const document = this.document;
 
         let commit: GitBlameCommit | undefined;
         let hover: DecorationOptions | undefined;
@@ -36,8 +37,13 @@ export class HoverBlameAnnotationProvider extends BlameAnnotationProviderBase {
 
             hover = Annotations.hover(commit, renderOptions, cfg.heatmap.enabled, dateFormat);
 
-            const endIndex = cfg.wholeLine ? endOfLineIndex : this.editor.document.lineAt(line).firstNonWhitespaceCharacterIndex;
-            hover.range = this.editor.document.validateRange(new Range(line, 0, line, endIndex));
+            if (cfg.wholeLine) {
+                hover.range = document.validateRange(new Range(line, 0, line, endOfLineIndex));
+            }
+            else {
+                const endIndex = document.lineAt(line).firstNonWhitespaceCharacterIndex;
+                hover.range = new Range(line, 0, line, endIndex);
+            }
 
             if (cfg.heatmap.enabled) {
                 Annotations.applyHeatmap(hover, commit.date, now);