diff --git a/src/scrollbar-component.coffee b/src/scrollbar-component.coffee
index a7645b277..9290835db 100644
--- a/src/scrollbar-component.coffee
+++ b/src/scrollbar-component.coffee
@@ -38,6 +38,9 @@ ScrollbarComponent = React.createClass
 
     @getDOMNode().addEventListener 'scroll', @onScroll
 
+  componentWillUnmount: ->
+    @getDOMNode().removeEventListener 'scroll', @onScroll
+
   shouldComponentUpdate: (newProps) ->
     return true if newProps.visible isnt @props.visible
 
diff --git a/src/text-editor-component.coffee b/src/text-editor-component.coffee
index 149c9194d..a57f2762d 100644
--- a/src/text-editor-component.coffee
+++ b/src/text-editor-component.coffee
@@ -435,7 +435,8 @@ TextEditorComponent = React.createClass
       @refs.input.focus()
 
   blurred: ->
-    @setState(focused: false)
+    if @isMounted()
+      @setState(focused: false)
 
   onTextInput: (event) ->
     event.stopPropagation()
diff --git a/src/text-editor-element.coffee b/src/text-editor-element.coffee
index 5a39f8348..b83b4a11d 100644
--- a/src/text-editor-element.coffee
+++ b/src/text-editor-element.coffee
@@ -111,7 +111,7 @@ class TextEditorElement extends HTMLElement
 
   blurred: (event) ->
     unless atom.config.get('editor.useShadowDOM')
-      if event.relatedTarget is @component?.refs.input.getDOMNode()
+      if event.relatedTarget is @component?.refs.input?.getDOMNode()
         event.stopImmediatePropagation()
         return