diff --git a/src/text-editor.js b/src/text-editor.js
index 8132eb8411..9ce9dfc4aa 100644
--- a/src/text-editor.js
+++ b/src/text-editor.js
@@ -314,6 +314,10 @@ module.exports = class TextEditor {
       priority: 0,
       visible: params.lineNumberGutterVisible
     });
+
+    if (atom && atom.textEditors) {
+      this.disposables.add(atom.textEditors.add(this))
+    }
   }
 
   get element() {
diff --git a/src/workspace.js b/src/workspace.js
index 464c922d6b..4f84a3cf3b 100644
--- a/src/workspace.js
+++ b/src/workspace.js
@@ -609,7 +609,6 @@ module.exports = class Workspace extends Model {
     this.onDidAddPaneItem(({ item, pane, index }) => {
       if (item instanceof TextEditor) {
         const subscriptions = new CompositeDisposable(
-          this.textEditorRegistry.add(item),
           this.textEditorRegistry.maintainConfig(item)
         );
         if (!this.project.findBufferForId(item.buffer.id)) {