diff --git a/spec/text-editor-spec.coffee b/spec/text-editor-spec.coffee
index df997cd20..87c8727fc 100644
--- a/spec/text-editor-spec.coffee
+++ b/spec/text-editor-spec.coffee
@@ -4013,6 +4013,7 @@ describe "TextEditor", ->
 
   describe ".destroy()", ->
     it "destroys all markers associated with the edit session", ->
+      editor.foldAll()
       expect(buffer.getMarkerCount()).toBeGreaterThan 0
       editor.destroy()
       expect(buffer.getMarkerCount()).toBe 0
diff --git a/src/display-buffer.coffee b/src/display-buffer.coffee
index 9015ec16a..c1e80c576 100644
--- a/src/display-buffer.coffee
+++ b/src/display-buffer.coffee
@@ -1173,6 +1173,7 @@ class DisplayBuffer extends Model
     return
 
   destroyed: ->
+    fold.destroy() for markerId, fold of @foldsByMarkerId
     marker.disposables.dispose() for id, marker of @markers
     @scopedConfigSubscriptions.dispose()
     @disposables.dispose()