diff --git a/spec/text-editor-component-spec.js b/spec/text-editor-component-spec.js
index 91a9e0bdf..685e81361 100644
--- a/spec/text-editor-component-spec.js
+++ b/spec/text-editor-component-spec.js
@@ -934,6 +934,18 @@ describe('TextEditorComponent', () => {
         expect(editor.getSelectedScreenRange()).toEqual([[2, 0], [5, 0]])
       })
 
+      it('destroys folds when clicking on their fold markers', async () => {
+        const {component, element, editor} = buildComponent()
+        editor.foldBufferRow(1)
+        await component.getNextUpdatePromise()
+
+        const target = element.querySelector('.fold-marker')
+        const {clientX, clientY} = clientPositionForCharacter(component, 1, editor.lineLengthForScreenRow(1))
+        component.didMouseDownOnContent({detail: 1, button: 0, target, clientX, clientY})
+        expect(editor.isFoldedAtBufferRow(1)).toBe(false)
+        expect(editor.getCursorScreenPosition()).toEqual([0, 0])
+      })
+
       it('autoscrolls the content when dragging near the edge of the screen', async () => {
         const {component, editor} = buildComponent({width: 200, height: 200})
         const {scroller} = component.refs
diff --git a/src/text-editor-component.js b/src/text-editor-component.js
index 5b59d0d24..ed112a2be 100644
--- a/src/text-editor-component.js
+++ b/src/text-editor-component.js
@@ -761,13 +761,20 @@ class TextEditorComponent {
 
   didMouseDownOnContent (event) {
     const {model} = this.props
-    const {button, detail, ctrlKey, shiftKey, metaKey} = event
+    const {target, button, detail, ctrlKey, shiftKey, metaKey} = event
 
     // Only handle mousedown events for left mouse button (or the middle mouse
     // button on Linux where it pastes the selection clipboard).
     if (!(button === 0 || (this.getPlatform() === 'linux' && button === 1))) return
 
     const screenPosition = this.screenPositionForMouseEvent(event)
+
+    if (target.matches('.fold-marker')) {
+      const bufferPosition = model.bufferPositionForScreenPosition(screenPosition)
+      model.destroyFoldsIntersectingBufferRange(Range(bufferPosition, bufferPosition))
+      return
+    }
+
     const addOrRemoveSelection = metaKey || (ctrlKey && this.getPlatform() !== 'darwin')
 
     switch (detail) {