diff --git a/src/vs/workbench/browser/parts/activitybar/media/activityaction.css b/src/vs/workbench/browser/parts/activitybar/media/activityaction.css
index 5ab896b4915c643955611ff1f38de8388d649619..576fa8a166fdc8c596cc34ed2673e24995360d2d 100644
--- a/src/vs/workbench/browser/parts/activitybar/media/activityaction.css
+++ b/src/vs/workbench/browser/parts/activitybar/media/activityaction.css
@@ -50,6 +50,11 @@
 	border-left-color: #DF740C;
 }
 
+.monaco-workbench > .activitybar > .content .monaco-action-bar .action-item .action-label:active:before,
+.monaco-workbench > .activitybar > .content .monaco-action-bar .action-item .action-label:hover:before {
+	border: none;
+}
+
 .monaco-workbench > .activitybar.left > .content .monaco-action-bar .action-item .action-label:focus:before {
 	left: 1px;
 }
diff --git a/src/vs/workbench/browser/parts/editor/binaryDiffEditor.ts b/src/vs/workbench/browser/parts/editor/binaryDiffEditor.ts
index 45bec65fb8b604c2c2db86987d47d3e9bb270694..13e39fba59699bf73c486dd508d923fc94148665 100644
--- a/src/vs/workbench/browser/parts/editor/binaryDiffEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/binaryDiffEditor.ts
@@ -56,7 +56,6 @@ export class BinaryResourceDiffEditor extends BaseEditor implements IVerticalSas
 		let leftBinaryContainerElement = document.createElement('div');
 		leftBinaryContainerElement.className = 'binary-container';
 		this.leftBinaryContainer = $(leftBinaryContainerElement);
-		this.leftBinaryContainer.tabindex(0); // enable focus support
 
 		// Left Custom Scrollbars
 		this.leftScrollbar = new ScrollableElement(leftBinaryContainerElement, { horizontal: 'hidden', vertical: 'hidden' });
@@ -73,7 +72,6 @@ export class BinaryResourceDiffEditor extends BaseEditor implements IVerticalSas
 		let rightBinaryContainerElement = document.createElement('div');
 		rightBinaryContainerElement.className = 'binary-container';
 		this.rightBinaryContainer = $(rightBinaryContainerElement);
-		this.rightBinaryContainer.tabindex(0); // enable focus support
 
 		// Right Custom Scrollbars
 		this.rightScrollbar = new ScrollableElement(rightBinaryContainerElement, { horizontal: 'hidden', vertical: 'hidden' });
diff --git a/src/vs/workbench/browser/parts/editor/binaryEditor.ts b/src/vs/workbench/browser/parts/editor/binaryEditor.ts
index bcce054f5e9c42593ac512b69827528546e651cb..ac52be2bf84973a3919883bd32dd8ee1d70de374 100644
--- a/src/vs/workbench/browser/parts/editor/binaryEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/binaryEditor.ts
@@ -40,7 +40,6 @@ export abstract class BaseBinaryResourceEditor extends BaseEditor {
 		let binaryContainerElement = document.createElement('div');
 		binaryContainerElement.className = 'binary-container monaco-editor-background'; // Inherit the background color from selected theme'
 		this.binaryContainer = $(binaryContainerElement);
-		this.binaryContainer.tabindex(0); // enable focus support
 		parent.getHTMLElement().appendChild(this.binaryContainer.getHTMLElement());
 	}
 
diff --git a/src/vs/workbench/electron-browser/media/shell.css b/src/vs/workbench/electron-browser/media/shell.css
index ae4ed82c5dfbfb167c4a966b92e10279dfccac57..d3edb784cf3e325364a83ddefa31916128d49d8f 100644
--- a/src/vs/workbench/electron-browser/media/shell.css
+++ b/src/vs/workbench/electron-browser/media/shell.css
@@ -104,12 +104,18 @@
 	outline: 0 !important; /* tree indicates focus not via outline but through the focussed item */
 }
 
-.monaco-shell .activitybar [tabindex="0"]:focus {
-	outline: 0; /* activity bar indicates focus custom */
+.monaco-shell [tabindex="0"]:active,
+.monaco-shell select:active,
+.monaco-shell input[type="button"]:active,
+.monaco-shell input[type="submit"]:active,
+.monaco-shell input[type="checkbox"]:active,
+.monaco-shell .monaco-tree.focused:active .monaco-tree-rows:empty,
+.monaco-shell .monaco-tree.focused.no-item-focus:active .monaco-tree-rows {
+	outline: 0 !important; /* fixes some flashing outlines from showing up when clicking */
 }
 
-.monaco-shell .part.editor .binary-container:focus {
-	outline: 0; /* binary container indicates focus custom */
+.monaco-shell .activitybar [tabindex="0"]:focus {
+	outline: 0; /* activity bar indicates focus custom */
 }
 
 /* END Keyboard Focus Indication Styles */
diff --git a/src/vs/workbench/parts/debug/browser/debugHover.ts b/src/vs/workbench/parts/debug/browser/debugHover.ts
index d526cceb93ef2344d1a622009eca6fd405c17027..0dafab6b2b6abed8578449f98397dabbefa8e99b 100644
--- a/src/vs/workbench/parts/debug/browser/debugHover.ts
+++ b/src/vs/workbench/parts/debug/browser/debugHover.ts
@@ -17,7 +17,7 @@ import viewer = require('vs/workbench/parts/debug/browser/debugViewer');
 const $ = dom.emmet;
 const debugTreeOptions = {
 	indentPixels: 6,
-	twistiePixels: 12
+	twistiePixels: 15
 };
 const MAX_ELEMENTS_SHOWN = 18;
 
@@ -42,7 +42,7 @@ export class DebugHoverWidget implements editorbrowser.IContentWidget {
 		this.tree = new Tree(this.treeContainer, {
 			dataSource: new viewer.VariablesDataSource(this.debugService),
 			renderer: this.instantiationService.createInstance(VariablesHoverRenderer),
-			controller: new DebugHoverController()
+			controller: new DebugHoverController(editor)
 		}, debugTreeOptions);
 		this.tree.addListener2('item:expanded', () => {
 			this.layoutTree();
@@ -194,11 +194,16 @@ export class DebugHoverWidget implements editorbrowser.IContentWidget {
 
 class DebugHoverController extends DefaultController {
 
+	constructor(private editor: editorbrowser.ICodeEditor) {
+		super();
+	}
+
 	/* protected */ public onLeftClick(tree: ITree, element: any, eventish: ICancelableEvent, origin: string = 'mouse'): boolean {
 		if (element.reference > 0) {
 			super.onLeftClick(tree, element, eventish, origin);
 			tree.clearFocus();
 			tree.deselect(element);
+			this.editor.focus();
 		}
 
 		return true;
diff --git a/src/vs/workbench/parts/debug/browser/media/debugHover.css b/src/vs/workbench/parts/debug/browser/media/debugHover.css
index 45e5d95713670cb6b17cabb0e30f20d452f791c4..3f69a7ca2fcbe30013edbb9a05a0f68adddd0a21 100644
--- a/src/vs/workbench/parts/debug/browser/media/debugHover.css
+++ b/src/vs/workbench/parts/debug/browser/media/debugHover.css
@@ -4,7 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 
 .monaco-editor .debug-hover-widget {
-	padding: 0 3px 0 3px;
 	border: 1px solid #CCC;
 	position: absolute;
 	margin-top: -1px;
diff --git a/src/vs/workbench/parts/files/browser/views/explorerView.ts b/src/vs/workbench/parts/files/browser/views/explorerView.ts
index 6729fc7cf7204fd2f201286833e0db7014838719..85fa9bdad0ad0729a9accc8371540894ec1cd43a 100644
--- a/src/vs/workbench/parts/files/browser/views/explorerView.ts
+++ b/src/vs/workbench/parts/files/browser/views/explorerView.ts
@@ -314,8 +314,8 @@ export class ExplorerView extends CollapsibleViewletView {
 			filter: this.filter,
 			dnd: dnd
 		}, {
-				autoExpandSingleChildren: true
-			});
+			autoExpandSingleChildren: true
+		});
 
 		this.toDispose.push(lifecycle.toDisposable(() => renderer.dispose()));