diff --git a/src/typings/vscode-xterm.d.ts b/src/typings/vscode-xterm.d.ts
index a8000eec916fa4f5914a2f4c4a3447f8eee01fd5..84d9593b9d4c59db203c6970adb4bb372045d019 100644
--- a/src/typings/vscode-xterm.d.ts
+++ b/src/typings/vscode-xterm.d.ts
@@ -332,6 +332,12 @@ declare module 'vscode-xterm' {
 		 */
 		deregisterLinkMatcher(matcherId: number): void;
 
+		/**
+		 * Enters screen reader navigation mode. This will only work when
+		 * the screenReaderMode option is true.
+		 */
+		enterNavigationMode(): void;
+
 		/**
 		 * Gets whether the terminal has an active selection.
 		 */
diff --git a/src/vs/workbench/parts/terminal/common/terminal.ts b/src/vs/workbench/parts/terminal/common/terminal.ts
index cd837dd9be5f549b315db24fe2c172dc59c65e9e..b594dac62d2b8f1d52291b5153ef06ad1a0daa33 100644
--- a/src/vs/workbench/parts/terminal/common/terminal.ts
+++ b/src/vs/workbench/parts/terminal/common/terminal.ts
@@ -388,4 +388,9 @@ export interface ITerminalInstance {
 	 * Sets the title of the terminal instance.
 	 */
 	setTitle(title: string, eventFromProcess: boolean): void;
+
+	/**
+	 * Enter screen reader navigation mode.
+	 */
+	enterNavigationMode(): void;
 }
diff --git a/src/vs/workbench/parts/terminal/electron-browser/media/xterm.css b/src/vs/workbench/parts/terminal/electron-browser/media/xterm.css
index aadbf436fc432a60935e463a73231344433a0d52..6068c9445bdcaacfba915339db57dee091cf66a2 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/media/xterm.css
+++ b/src/vs/workbench/parts/terminal/electron-browser/media/xterm.css
@@ -127,7 +127,7 @@
 	cursor: text;
 }
 
-.xterm .accessibility {
+.xterm .xterm-accessibility {
 	position: absolute;
 	left: 0;
 	top: 0;
@@ -136,10 +136,14 @@
 	z-index: 100;
 }
 
-.xterm .accessibility-tree {
+.xterm .xterm-accessibility-tree {
 	color: transparent;
 }
 
+.xterm .xterm-accessibility-tree:focus [id^="xterm-active-item-"] {
+	outline: 1px solid #F80;
+}
+
 .xterm .live-region {
 	position: absolute;
 	left: -9999px;
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts b/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts
index e4b726a6c83d2bde411ae847b130b14366858f67..7ba6919d03d66768e31887f8324bb5b2e504788f 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts
@@ -18,7 +18,7 @@ import { TERMINAL_DEFAULT_SHELL_UNIX_LIKE, TERMINAL_DEFAULT_SHELL_WINDOWS } from
 import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions';
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { KillTerminalAction, CopyTerminalSelectionAction, CreateNewTerminalAction, CreateNewInActiveWorkspaceTerminalAction, FocusActiveTerminalAction, FocusNextTerminalAction, FocusPreviousTerminalAction, SelectDefaultShellWindowsTerminalAction, RunSelectedTextInTerminalAction, RunActiveFileInTerminalAction, ScrollDownTerminalAction, ScrollDownPageTerminalAction, ScrollToBottomTerminalAction, ScrollUpTerminalAction, ScrollUpPageTerminalAction, ScrollToTopTerminalAction, TerminalPasteAction, ToggleTerminalAction, ClearTerminalAction, AllowWorkspaceShellTerminalCommand, DisallowWorkspaceShellTerminalCommand, RenameTerminalAction, SelectAllTerminalAction, FocusTerminalFindWidgetAction, HideTerminalFindWidgetAction, ShowNextFindTermTerminalFindWidgetAction, ShowPreviousFindTermTerminalFindWidgetAction, DeleteWordLeftTerminalAction, DeleteWordRightTerminalAction, QuickOpenActionTermContributor, QuickOpenTermAction, TERMINAL_PICKER_PREFIX } from 'vs/workbench/parts/terminal/electron-browser/terminalActions';
+import { KillTerminalAction, CopyTerminalSelectionAction, CreateNewTerminalAction, CreateNewInActiveWorkspaceTerminalAction, FocusActiveTerminalAction, FocusNextTerminalAction, FocusPreviousTerminalAction, SelectDefaultShellWindowsTerminalAction, RunSelectedTextInTerminalAction, RunActiveFileInTerminalAction, ScrollDownTerminalAction, ScrollDownPageTerminalAction, ScrollToBottomTerminalAction, ScrollUpTerminalAction, ScrollUpPageTerminalAction, ScrollToTopTerminalAction, TerminalPasteAction, ToggleTerminalAction, ClearTerminalAction, AllowWorkspaceShellTerminalCommand, DisallowWorkspaceShellTerminalCommand, RenameTerminalAction, SelectAllTerminalAction, FocusTerminalFindWidgetAction, HideTerminalFindWidgetAction, ShowNextFindTermTerminalFindWidgetAction, ShowPreviousFindTermTerminalFindWidgetAction, DeleteWordLeftTerminalAction, DeleteWordRightTerminalAction, QuickOpenActionTermContributor, QuickOpenTermAction, TERMINAL_PICKER_PREFIX, EnterLineNavigationModeTerminalAction } from 'vs/workbench/parts/terminal/electron-browser/terminalActions';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { ShowAllCommandsAction } from 'vs/workbench/parts/quickopen/browser/commandsHandler';
 import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
@@ -204,6 +204,7 @@ configurationRegistry.registerConfiguration({
 				FocusActiveTerminalAction.ID,
 				FocusPreviousTerminalAction.ID,
 				FocusNextTerminalAction.ID,
+				EnterLineNavigationModeTerminalAction.ID,
 				'workbench.action.tasks.build',
 				'workbench.action.tasks.restartTask',
 				'workbench.action.tasks.runTask',
@@ -386,6 +387,9 @@ actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(DeleteWordRightT
 	primary: KeyMod.CtrlCmd | KeyCode.Delete,
 	mac: { primary: KeyMod.Alt | KeyCode.Delete }
 }, KEYBINDING_CONTEXT_TERMINAL_FOCUS), 'Terminal: Delete Word Right', category);
+actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(EnterLineNavigationModeTerminalAction, EnterLineNavigationModeTerminalAction.ID, EnterLineNavigationModeTerminalAction.LABEL, {
+	primary: KeyMod.CtrlCmd | KeyCode.KEY_L
+}, KEYBINDING_CONTEXT_TERMINAL_FOCUS), 'Terminal: Enter Line Navigation Mode', category);
 
 terminalCommands.setup();
 
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts
index 8ab6467d6913136e804f61c2989c81bb4b1244af..5b1f7a658bd61060bc208567c2830a7874b670a3 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts
@@ -196,6 +196,27 @@ export class DeleteWordRightTerminalAction extends Action {
 	}
 }
 
+export class EnterLineNavigationModeTerminalAction extends Action {
+
+	public static readonly ID = 'workbench.action.terminal.enterLineNavigationMode';
+	public static readonly LABEL = nls.localize('workbench.action.terminal.enterLineNavigationMode', "Enter Line Navigation Mode");
+
+	constructor(
+		id: string, label: string,
+		@ITerminalService private terminalService: ITerminalService
+	) {
+		super(id, label);
+	}
+
+	public run(event?: any): TPromise<any> {
+		let terminalInstance = this.terminalService.getActiveInstance();
+		if (terminalInstance) {
+			terminalInstance.enterNavigationMode();
+		}
+		return TPromise.as(void 0);
+	}
+}
+
 export class CreateNewTerminalAction extends Action {
 
 	public static readonly ID = 'workbench.action.terminal.new';
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
index d9b982340fb7ea9f71c12891d736b21e54ebfe25..812dc8feb608342b69a734cf9c36d350e6b2175b 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
@@ -1123,6 +1123,15 @@ export class TerminalInstance implements ITerminalInstance {
 	private _updateTheme(theme?: ITheme): void {
 		this._xterm.setOption('theme', this._getXtermTheme(theme));
 	}
+
+	public enterNavigationMode(): void {
+		// Perform this asynchronously as entering navigation mode will override
+		// the key event handlers which seemed to mess with the keybindings
+		// system
+		setTimeout(() => {
+			this._xterm.enterNavigationMode();
+		}, 100);
+	}
 }
 
 registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {