diff --git a/src/scrollbar-component.coffee b/src/scrollbar-component.coffee
index 45cfbd24031..6b2cda070fd 100644
--- a/src/scrollbar-component.coffee
+++ b/src/scrollbar-component.coffee
@@ -12,6 +12,9 @@ class ScrollbarComponent
 
     @domNode.addEventListener 'scroll', @onScrollCallback
 
+  destroy: ->
+    @onScroll = null
+
   getDomNode: ->
     @domNode
 
diff --git a/src/text-editor-component.coffee b/src/text-editor-component.coffee
index ef1711a04c7..4a67ffede05 100644
--- a/src/text-editor-component.coffee
+++ b/src/text-editor-component.coffee
@@ -119,6 +119,12 @@ class TextEditorComponent
     @gutterContainerComponent?.destroy()
     @domElementPool.clear()
 
+    @verticalScrollbarComponent.destroy()
+    @horizontalScrollbarComponent.destroy()
+
+    @onVerticalScroll = null
+    @onHorizontalScroll = null
+
   getDomNode: ->
     @domNode
 
@@ -563,7 +569,7 @@ class TextEditorComponent
     @sampleBackgroundColors()
     @remeasureCharacterWidths()
 
-  handleDragUntilMouseUp: (dragHandler) =>
+  handleDragUntilMouseUp: (dragHandler) ->
     dragging = false
     lastMousePosition = {}
     animationLoop = =>
diff --git a/src/text-editor-presenter.coffee b/src/text-editor-presenter.coffee
index f5ca2bd6e05..ae5a51a0daa 100644
--- a/src/text-editor-presenter.coffee
+++ b/src/text-editor-presenter.coffee
@@ -129,7 +129,7 @@ class TextEditorPresenter
       @shouldUpdateCustomGutterDecorationState = true
       @emitDidUpdateState()
 
-    @model.onDidUpdateMarkers =>
+    @disposables.add @model.onDidUpdateMarkers =>
       @shouldUpdateLinesState = true
       @shouldUpdateLineNumbersState = true
       @shouldUpdateDecorations = true