diff --git a/src/text-editor-component.coffee b/src/text-editor-component.coffee
index 3b50b3997..15e8e0b08 100644
--- a/src/text-editor-component.coffee
+++ b/src/text-editor-component.coffee
@@ -199,7 +199,6 @@ TextEditorComponent = React.createClass
   componentWillUnmount: ->
     {editor, hostElement} = @props
 
-    hostElement.__spacePenView.trigger 'editor:will-be-removed', [hostElement.__spacePenView]
     @unsubscribe()
     @scopedConfigSubscriptions.dispose()
     window.removeEventListener 'resize', @requestHeightAndWidthMeasurement
diff --git a/src/text-editor-view.coffee b/src/text-editor-view.coffee
index f27b88e76..61869ddff 100644
--- a/src/text-editor-view.coffee
+++ b/src/text-editor-view.coffee
@@ -138,6 +138,7 @@ class TextEditorView extends View
 
   beforeRemove: ->
     @trigger 'editor:detached', [this]
+    @trigger 'editor:will-be-removed', [this]
     @attached = false
 
   remove: (selector, keepData) ->