diff --git a/src/vs/code/electron-main/menus.ts b/src/vs/code/electron-main/menus.ts
index da6948e8a52..e3d88260ec6 100644
--- a/src/vs/code/electron-main/menus.ts
+++ b/src/vs/code/electron-main/menus.ts
@@ -493,7 +493,7 @@ export class VSCodeMenu {
 			replace,
 			__separator__(),
 			findInFiles
-		].forEach((item) => winLinuxEditMenu.append(item));
+		].forEach(item => winLinuxEditMenu.append(item));
 	}
 
 	private setViewMenu(viewMenu: Electron.Menu): void {
@@ -553,7 +553,41 @@ export class VSCodeMenu {
 	private setGotoMenu(gotoMenu: Electron.Menu): void {
 		let back = this.createMenuItem(nls.localize({ key: 'miBack', comment: ['&& denotes a mnemonic'] }, "&&Back"), 'workbench.action.navigateBack');
 		let forward = this.createMenuItem(nls.localize({ key: 'miForward', comment: ['&& denotes a mnemonic'] }, "&&Forward"), 'workbench.action.navigateForward');
-		let navigateHistory = this.createMenuItem(nls.localize({ key: 'miNavigateHistory', comment: ['&& denotes a mnemonic'] }, "&&Navigate History"), 'workbench.action.openPreviousEditor');
+
+		let switchEditorMenu = new Menu();
+
+		let nextEditor = this.createMenuItem(nls.localize({ key: 'miNextEditor', comment: ['&& denotes a mnemonic'] }, "&&Next Editor"), 'workbench.action.nextEditor');
+		let previousEditor = this.createMenuItem(nls.localize({ key: 'miPreviousEditor', comment: ['&& denotes a mnemonic'] }, "&&Previous Editor"), 'workbench.action.previousEditor');
+		let previousEditorInGroup = this.createMenuItem(nls.localize({ key: 'miPreviousEditorInGroup', comment: ['&& denotes a mnemonic'] }, "Previous &&Editor in Group"), 'workbench.action.openPreviousEditorInGroup');
+
+		[
+			nextEditor,
+			previousEditor,
+			__separator__(),
+			previousEditorInGroup
+		].forEach(item => switchEditorMenu.append(item));
+
+		let switchEditor = new MenuItem({ label: mnemonicLabel(nls.localize({ key: 'miSwitchEditor', comment: ['&& denotes a mnemonic'] }, "Switch &&Editor")), submenu: switchEditorMenu, enabled: true });
+
+		let switchGroupMenu = new Menu();
+
+		let focusFirstGroup = this.createMenuItem(nls.localize({ key: 'miFocusFirstGroup', comment: ['&& denotes a mnemonic'] }, "&&Left Group"), 'workbench.action.focusFirstEditor');
+		let focusSecondGroup = this.createMenuItem(nls.localize({ key: 'miFocusSecondGroup', comment: ['&& denotes a mnemonic'] }, "&&Side Group"), 'workbench.action.focusSecondEditor');
+		let focusThirdGroup = this.createMenuItem(nls.localize({ key: 'miFocusThirdGroup', comment: ['&& denotes a mnemonic'] }, "&&Right Group"), 'workbench.action.focusThirdEditor');
+		let nextGroup = this.createMenuItem(nls.localize({ key: 'miNextGroup', comment: ['&& denotes a mnemonic'] }, "&&Next Group"), 'workbench.action.focusNextGroup');
+		let previousGroup = this.createMenuItem(nls.localize({ key: 'miPreviousGroup', comment: ['&& denotes a mnemonic'] }, "&&Previous Group"), 'workbench.action.focusPreviousGroup');
+
+		[
+			focusFirstGroup,
+			focusSecondGroup,
+			focusThirdGroup,
+			__separator__(),
+			nextGroup,
+			previousGroup
+		].forEach(item => switchGroupMenu.append(item));
+
+		let switchGroup = new MenuItem({ label: mnemonicLabel(nls.localize({ key: 'miSwitchGroup', comment: ['&& denotes a mnemonic'] }, "Switch &&Group")), submenu: switchGroupMenu, enabled: true });
+
 		let gotoFile = this.createMenuItem(nls.localize({ key: 'miGotoFile', comment: ['&& denotes a mnemonic'] }, "Go to &&File..."), 'workbench.action.quickOpen');
 		let gotoSymbol = this.createMenuItem(nls.localize({ key: 'miGotoSymbol', comment: ['&& denotes a mnemonic'] }, "Go to &&Symbol..."), 'workbench.action.gotoSymbol');
 		let gotoDefinition = this.createMenuItem(nls.localize({ key: 'miGotoDefinition', comment: ['&& denotes a mnemonic'] }, "Go to &&Definition"), 'editor.action.goToDeclaration');
@@ -563,13 +597,14 @@ export class VSCodeMenu {
 			back,
 			forward,
 			__separator__(),
-			navigateHistory,
+			switchEditor,
+			switchGroup,
 			__separator__(),
 			gotoFile,
 			gotoSymbol,
 			gotoDefinition,
 			gotoLine
-		].forEach((item) => gotoMenu.append(item));
+		].forEach(item => gotoMenu.append(item));
 	}
 
 	private setMacWindowMenu(macWindowMenu: Electron.Menu): void {
@@ -582,7 +617,7 @@ export class VSCodeMenu {
 			close,
 			__separator__(),
 			bringAllToFront
-		].forEach((item) => macWindowMenu.append(item));
+		].forEach(item => macWindowMenu.append(item));
 	}
 
 	private toggleDevTools(): void {