diff --git a/src/vs/editor/contrib/folding/folding.css b/src/vs/editor/contrib/folding/folding.css
index fbc0462fe351e93824fedf998f2da9c3e905e81d..445f8c05a495512d8ba442a4db05c9914fdf61e8 100644
--- a/src/vs/editor/contrib/folding/folding.css
+++ b/src/vs/editor/contrib/folding/folding.css
@@ -24,7 +24,7 @@
 }
 
 .monaco-editor .margin-view-overlays:hover .folding,
-.monaco-editor.alwaysShowFoldIcons .margin-view-overlays .folding {
+.monaco-editor .margin-view-overlays .folding.alwaysShowFoldIcons {
 	opacity: 1;
 }
 
diff --git a/src/vs/editor/contrib/folding/folding.ts b/src/vs/editor/contrib/folding/folding.ts
index 692ce9eaba5e1de95c2c942106d8e3ffa883a4c6..777797b334115dd7b0970a28d1bc49952b416590 100644
--- a/src/vs/editor/contrib/folding/folding.ts
+++ b/src/vs/editor/contrib/folding/folding.ts
@@ -177,12 +177,14 @@ export class FoldingController {
 	}
 
 	private onModelContentChanged() {
-		this.foldingModelPromise = this.updateScheduler.trigger(() => {
-			if (this.foldingModel) { // null if editor has been disposed, or folding turned off
-				this.foldingModel.update(this.computeRanges(this.foldingModel.textModel));
-			}
-			return this.foldingModel;
-		});
+		if (this.updateScheduler) {
+			this.foldingModelPromise = this.updateScheduler.trigger(() => {
+				if (this.foldingModel) { // null if editor has been disposed, or folding turned off
+					this.foldingModel.update(this.computeRanges(this.foldingModel.textModel));
+				}
+				return this.foldingModel;
+			});
+		}
 	}
 
 	private onHiddenRangesChanges(hiddenRanges: IRange[]) {
diff --git a/src/vs/editor/contrib/folding/foldingDecorations.ts b/src/vs/editor/contrib/folding/foldingDecorations.ts
index fe5f0837c34b1f7a1f6af6440df8c2ae29205c02..b549fcac3c599f3ed5707dd300e4367f06a99208 100644
--- a/src/vs/editor/contrib/folding/foldingDecorations.ts
+++ b/src/vs/editor/contrib/folding/foldingDecorations.ts
@@ -18,12 +18,12 @@ export class FoldingDecorationProvider implements IDecorationProvider {
 
 	private EXPANDED_AUTO_HIDE_VISUAL_DECORATION = ModelDecorationOptions.register({
 		stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
-		linesDecorationsClassName: 'folding autoHide'
+		linesDecorationsClassName: 'folding'
 	});
 
 	private EXPANDED_VISUAL_DECORATION = ModelDecorationOptions.register({
 		stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
-		linesDecorationsClassName: 'folding'
+		linesDecorationsClassName: 'folding alwaysShowFoldIcons'
 	});
 
 	public autoHideFoldingControls: boolean = true;