diff --git a/src/vs/workbench/browser/parts/editor/editorActions.ts b/src/vs/workbench/browser/parts/editor/editorActions.ts
index 43ed6ab2e90..c7dacc4e15e 100644
--- a/src/vs/workbench/browser/parts/editor/editorActions.ts
+++ b/src/vs/workbench/browser/parts/editor/editorActions.ts
@@ -150,7 +150,11 @@ export class FocusActiveGroupAction extends Action {
 	}
 
 	public run(): TPromise<any> {
-		this.editorService.getActiveEditor().focus();
+ 		const activeEditor = this.editorService.getActiveEditor();
+ 		if (activeEditor) {
+			activeEditor.focus();
+ 		}
+
 		return TPromise.as(true);
 	}
 }
@@ -1312,4 +1316,4 @@ export class MoveEditorToRightGroupAction extends Action {
 
 		return TPromise.as(true);
 	}
-}
\ No newline at end of file
+}