diff --git a/src/vs/editor/contrib/folding/browser/folding.ts b/src/vs/editor/contrib/folding/browser/folding.ts
index d6eba543ba4..5cac2cdf29d 100644
--- a/src/vs/editor/contrib/folding/browser/folding.ts
+++ b/src/vs/editor/contrib/folding/browser/folding.ts
@@ -318,12 +318,22 @@ export class FoldingController implements IFoldingController {
 
 		let model = this.editor.getModel();
 
+
 		let iconClicked = false;
 		switch (e.target.type) {
 			case MouseTargetType.GUTTER_LINE_DECORATIONS:
 				iconClicked = true;
 				break;
 			case MouseTargetType.CONTENT_EMPTY:
+				if (range.startColumn === model.getLineMaxColumn(range.startLineNumber)) {
+					let editorCoords = dom.getDomNodePagePosition(this.editor.getDomNode());
+					let pos = this.editor.getScrolledVisiblePosition(range.getEndPosition());
+					if (e.event.posy > editorCoords.top + pos.top + pos.height) {
+						return;
+					}
+					break;
+				}
+				return;
 			case MouseTargetType.CONTENT_TEXT:
 				if (range.startColumn === model.getLineMaxColumn(range.startLineNumber)) {
 					break;