diff --git a/src/vs/workbench/browser/parts/editor/editorCommands.ts b/src/vs/workbench/browser/parts/editor/editorCommands.ts
index a2555b8247fd545ef7aa3e07ea7946004af3f52c..a09a31f09cf0ddf688b406ea70d2264914fe4d93 100644
--- a/src/vs/workbench/browser/parts/editor/editorCommands.ts
+++ b/src/vs/workbench/browser/parts/editor/editorCommands.ts
@@ -307,6 +307,14 @@ function registerEditorCommands() {
 			const groups = distinct(contexts.map(context => context.group));
 
 			const editorsToClose = new Map<Position, IEditorInput[]>();
+
+			if (groups.length === 0) {
+				const activeEditor = editorService.getActiveEditor();
+				if (activeEditor) {
+					return editorService.closeEditor(activeEditor.position, activeEditor.input);
+				}
+			}
+
 			groups.forEach(group => {
 				const position = editorGroupService.getStacksModel().positionOfGroup(group);
 				editorsToClose.set(position, contexts.map(c => {