diff --git a/src/vs/workbench/contrib/files/browser/editors/binaryFileEditor.ts b/src/vs/workbench/contrib/files/browser/editors/binaryFileEditor.ts
index 1daf1517449d18e52d415809afec21c775459046..7b93fdb20c7c1c1a030c074337881746040eb844 100644
--- a/src/vs/workbench/contrib/files/browser/editors/binaryFileEditor.ts
+++ b/src/vs/workbench/contrib/files/browser/editors/binaryFileEditor.ts
@@ -49,13 +49,13 @@ export class BinaryFileEditor extends BaseBinaryResourceEditor {
 	}
 
 	private async openInternal(input: EditorInput, options: EditorOptions | undefined): Promise<void> {
-		if (input instanceof FileEditorInput) {
+		if (input instanceof FileEditorInput && this.group) {
+
+			// Enforce to open the input as text to enable our text based viewer
 			input.setForceOpenAsText();
-			if (this.group !== undefined) {
-				await openEditorWith(input, undefined, options, this.group, this.editorService, this.configurationService, this.quickInputService);
-			} else {
-				await this.editorService.openEditor(input, options, this.group);
-			}
+
+			// If more editors are installed that can handle this input, show a picker
+			await openEditorWith(input, undefined, options, this.group, this.editorService, this.configurationService, this.quickInputService);
 		}
 	}