diff --git a/extensions/git/src/commands.ts b/extensions/git/src/commands.ts
index dbeb559c324..48197dbf603 100644
--- a/extensions/git/src/commands.ts
+++ b/extensions/git/src/commands.ts
@@ -174,7 +174,6 @@ export class CommandCenter {
 		}
 
 		const opts: TextDocumentShowOptions = {
-			preview: true,
 			viewColumn
 		};
 
diff --git a/src/vs/workbench/api/node/extHostApiCommands.ts b/src/vs/workbench/api/node/extHostApiCommands.ts
index bd540c0fa08..0390cec3705 100644
--- a/src/vs/workbench/api/node/extHostApiCommands.ts
+++ b/src/vs/workbench/api/node/extHostApiCommands.ts
@@ -205,11 +205,10 @@ export class ExtHostApiCommands {
 			});
 
 		this._register('vscode.diff', (left: URI, right: URI, label: string, options?: vscode.TextDocumentShowOptions) => {
-
 			let editorOptions: IEditorOptions;
 			if (options) {
 				editorOptions = {
-					pinned: !options.preview,
+					pinned: typeof options.preview === 'boolean' ? !options.preview : undefined,
 					preserveFocus: options.preserveFocus
 				};
 			}
diff --git a/src/vs/workbench/api/node/extHostTextEditors.ts b/src/vs/workbench/api/node/extHostTextEditors.ts
index 0f4bfdf398a..c49aabf9382 100644
--- a/src/vs/workbench/api/node/extHostTextEditors.ts
+++ b/src/vs/workbench/api/node/extHostTextEditors.ts
@@ -63,20 +63,18 @@ export class ExtHostEditors extends ExtHostEditorsShape {
 		if (typeof columnOrOptions === 'number') {
 			options = {
 				position: TypeConverters.fromViewColumn(columnOrOptions),
-				preserveFocus: preserveFocus,
-				pinned: true
+				preserveFocus
 			};
 		} else if (typeof columnOrOptions === 'object') {
 			options = {
 				position: TypeConverters.fromViewColumn(columnOrOptions.viewColumn),
 				preserveFocus: columnOrOptions.preserveFocus,
-				pinned: columnOrOptions.preview === undefined ? true : !columnOrOptions.preview
+				pinned: typeof columnOrOptions.preview === 'boolean' ? !columnOrOptions.preview : undefined
 			};
 		} else {
 			options = {
 				position: EditorPosition.ONE,
-				preserveFocus: false,
-				pinned: true
+				preserveFocus: false
 			};
 		}
 
diff --git a/src/vs/workbench/browser/parts/editor/editorPart.ts b/src/vs/workbench/browser/parts/editor/editorPart.ts
index 697f0dcfe3c..bbb9c345a6f 100644
--- a/src/vs/workbench/browser/parts/editor/editorPart.ts
+++ b/src/vs/workbench/browser/parts/editor/editorPart.ts
@@ -320,6 +320,7 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService
 		// stacks model gets updated if any of the UI updating fails with an error.
 		const group = this.ensureGroup(position, !options || !options.preserveFocus);
 		const pinned = !this.tabOptions.previewEditors || (options && (options.pinned || typeof options.index === 'number')) || input.isDirty();
+
 		const active = (group.count === 0) || !options || !options.inactive;
 		group.openEditor(input, { active, pinned, index: options && options.index });
 
diff --git a/src/vs/workbench/electron-browser/commands.ts b/src/vs/workbench/electron-browser/commands.ts
index 77c2df2dbfe..fa35f6a9600 100644
--- a/src/vs/workbench/electron-browser/commands.ts
+++ b/src/vs/workbench/electron-browser/commands.ts
@@ -399,8 +399,7 @@ export function registerCommands(): void {
 
 		if (!options || typeof options !== 'object') {
 			options = {
-				preserveFocus: false,
-				pinned: true
+				preserveFocus: false
 			};
 		}