diff --git a/src/text-editor-registry.coffee b/src/text-editor-registry.coffee
index 8a17335d4..e31630fee 100644
--- a/src/text-editor-registry.coffee
+++ b/src/text-editor-registry.coffee
@@ -26,8 +26,20 @@ class TextEditorRegistry
   # editor is destroyed.
   add: (editor) ->
     @editors.add(editor)
+    editor.registered = true
+
     @emitter.emit 'did-add-editor', editor
-    new Disposable => @editors.delete(editor)
+    new Disposable => @remove(editor)
+
+  # Remove a `TextEditor`.
+  #
+  # * `editor` The editor to remove.
+  #
+  # Returns a {Boolean} indicating whether the editor was successfully removed.
+  remove: (editor) ->
+    removed = @editors.delete(editor)
+    editor.registered = false
+    removed
 
   # Invoke the given callback with all the current and future registered
   # `TextEditors`.
diff --git a/src/text-editor.coffee b/src/text-editor.coffee
index 9976e5906..bdc283d8f 100644
--- a/src/text-editor.coffee
+++ b/src/text-editor.coffee
@@ -62,6 +62,7 @@ class TextEditor extends Model
   selectionFlashDuration: 500
   gutterContainer: null
   editorElement: null
+  registered: false
 
   Object.defineProperty @prototype, "element",
     get: -> @getElement()
@@ -157,7 +158,7 @@ class TextEditor extends Model
     firstVisibleScreenColumn: @getFirstVisibleScreenColumn()
     displayBuffer: @displayBuffer.serialize()
     selectionsMarkerLayerId: @selectionsMarkerLayer.id
-    registered: atom.textEditors.editors.has this
+    registered: @registered
 
   subscribeToBuffer: ->
     @buffer.retain()