diff --git a/src/vs/workbench/parts/comments/electron-browser/commentThreadWidget.ts b/src/vs/workbench/parts/comments/electron-browser/commentThreadWidget.ts
index b26e3bc51bdc18db0dd28147a00e2e4e332af378..a363aa8a857dc4375fda6d0610fbc99b569312d0 100644
--- a/src/vs/workbench/parts/comments/electron-browser/commentThreadWidget.ts
+++ b/src/vs/workbench/parts/comments/electron-browser/commentThreadWidget.ts
@@ -31,7 +31,8 @@ import { IModeService } from 'vs/editor/common/services/modeService';
 import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { KeyCode } from '../../../../base/common/keyCodes';
 import { ICommentService } from '../../../services/comments/electron-browser/commentService';
-import { Range } from 'vs/editor/common/core/range';
+import { Range, IRange } from 'vs/editor/common/core/range';
+import { IPosition } from 'vs/editor/common/core/position';
 
 export const COMMENTEDITOR_DECORATION_KEY = 'commenteditordecoration';
 const EXPAND_ACTION_CLASS = 'expand-review-action octicon octicon-chevron-down';
@@ -151,8 +152,6 @@ export class ReviewZoneWidget extends ZoneWidget {
 
 	public reveal(commentId?: string) {
 		if (this._isCollapsed) {
-			this._isCollapsed = false;
-
 			if (this._decorationIDs && this._decorationIDs.length) {
 				let range = this.editor.getModel().getDecorationRange(this._decorationIDs[0]);
 				this.show(range, 2);
@@ -212,7 +211,6 @@ export class ReviewZoneWidget extends ZoneWidget {
 
 		this._toggleAction = new Action('review.expand', nls.localize('label.expand', "Expand"), this._isCollapsed ? EXPAND_ACTION_CLASS : COLLAPSE_ACTION_CLASS, true, () => {
 			if (this._isCollapsed) {
-				this._isCollapsed = false;
 				this.show({ lineNumber: this._commentThread.range.startLineNumber, column: 1 }, 2);
 			}
 			else {
@@ -519,10 +517,8 @@ export class ReviewZoneWidget extends ZoneWidget {
 		}
 
 		if (this._isCollapsed) {
-			this._isCollapsed = !this._isCollapsed;
 			this.show({ lineNumber: lineNumber, column: 1 }, 2);
 		} else {
-			this._isCollapsed = !this._isCollapsed;
 			this.hide();
 		}
 	}
@@ -535,6 +531,16 @@ export class ReviewZoneWidget extends ZoneWidget {
 		});
 	}
 
+	show(rangeOrPos: IRange | IPosition, heightInLines: number): void {
+		this._isCollapsed = false;
+		super.show(rangeOrPos, heightInLines);
+	}
+
+	hide() {
+		this._isCollapsed = true;
+		super.hide();
+	}
+
 	dispose() {
 		super.dispose();
 		if (this._resizeObserver) {
diff --git a/src/vs/workbench/parts/comments/electron-browser/commentsEditorContribution.ts b/src/vs/workbench/parts/comments/electron-browser/commentsEditorContribution.ts
index eb8f68d5fdff8abaa1136195bc3d3d87b746c458..f7c52e5813c5bb9a81ddf911bcce74c1dc488f3c 100644
--- a/src/vs/workbench/parts/comments/electron-browser/commentsEditorContribution.ts
+++ b/src/vs/workbench/parts/comments/electron-browser/commentsEditorContribution.ts
@@ -371,10 +371,11 @@ export class ReviewController implements IEditorContribution {
 		}
 
 		if (this._commentWidgets) {
-			this._commentWidgets.forEach(widget => widget.dispose());
+			this._commentWidgets.forEach(widget => widget.hide());
 		}
 
 		this.editor.focus();
+		this.editor.revealRangeInCenter(this.editor.getSelection());
 	}
 }