diff --git a/git-blame.py b/git-blame.py
index 7ced011..b5424eb 100644
--- a/git-blame.py
+++ b/git-blame.py
@@ -7,6 +7,7 @@
 from subprocess import check_output as shell
 
 PHANTOM_KEY_ALL = 'git-blame-all'
+SETTING_PHANTOM_ALL_DISPLAYED = 'git-blame-all-displayed'
 
 stylesheet_one = '''
     <style>
@@ -240,6 +241,7 @@ def run(self, edit):
             phantoms.append(phantom)
 
         self.phantom_set.update(phantoms)
+        self.view.settings().set(SETTING_PHANTOM_ALL_DISPLAYED, True)
 
     def get_blame_lines(self, path):
         '''Run `git blame` and get the output lines.
@@ -326,10 +328,17 @@ def run(self, edit):
 
 class BlameEraseAllListener(sublime_plugin.ViewEventListener):
 
-    def on_modified(self):
+    @classmethod
+    def is_applicable(cls, settings):
+        '''Checks if the blame_erase_all command is applicable.
+        '''
+        return settings.get(SETTING_PHANTOM_ALL_DISPLAYED, False)
+
+    def on_modified_async(self):
         '''Automatically erases the blame results to prevent mismatches.
         '''
         self.view.run_command('blame_erase_all')
+        self.view.settings().erase(SETTING_PHANTOM_ALL_DISPLAYED)
 
 
 class InsertCommitDescriptionCommand(sublime_plugin.TextCommand):