diff --git a/src/vs/base/parts/tree/browser/treeDefaults.ts b/src/vs/base/parts/tree/browser/treeDefaults.ts
index 33a3ab2a4d6..2ca776fe84f 100644
--- a/src/vs/base/parts/tree/browser/treeDefaults.ts
+++ b/src/vs/base/parts/tree/browser/treeDefaults.ts
@@ -11,7 +11,7 @@ import dom = require('vs/base/browser/dom');
 import mouse = require('vs/base/browser/mouseEvent');
 import keyboard = require('vs/base/browser/keyboardEvent');
 import _ = require('vs/base/parts/tree/browser/tree');
-import {CommonKeybindings} from 'vs/base/common/keyCodes'
+import {CommonKeybindings} from 'vs/base/common/keyCodes';
 
 export interface ILegacyTemplateData {
 	root: HTMLElement;
diff --git a/src/vs/base/parts/tree/browser/treeView.ts b/src/vs/base/parts/tree/browser/treeView.ts
index 2156ca958ed..856dcb0bd74 100644
--- a/src/vs/base/parts/tree/browser/treeView.ts
+++ b/src/vs/base/parts/tree/browser/treeView.ts
@@ -9,17 +9,16 @@ import Browser = require('vs/base/browser/browser');
 import WinJS = require('vs/base/common/winjs.base');
 import Lifecycle = require('vs/base/common/lifecycle');
 import DOM = require('vs/base/browser/dom');
-import EventEmitter = require('vs/base/common/eventEmitter');
 import Diff = require('vs/base/common/diff/diff');
 import Touch = require('vs/base/browser/touch');
 import Mouse = require('vs/base/browser/mouseEvent');
 import Keyboard = require('vs/base/browser/keyboardEvent');
 import Model = require('vs/base/parts/tree/browser/treeModel');
 import dnd = require('./treeDnd');
-import { IIterator, ArrayIterator, MappedIterator } from 'vs/base/common/iterator';
+import { ArrayIterator, MappedIterator } from 'vs/base/common/iterator';
 import Scroll = require('vs/base/browser/ui/scrollbar/scrollableElement');
 import ScrollableElementImpl = require('vs/base/browser/ui/scrollbar/scrollableElementImpl');
-import { HeightMap } from 'vs/base/parts/tree/browser/treeViewModel'
+import { HeightMap } from 'vs/base/parts/tree/browser/treeViewModel';
 import _ = require('vs/base/parts/tree/browser/tree');
 import { IViewItem } from 'vs/base/parts/tree/browser/treeViewModel';
 import {IScrollable} from 'vs/base/common/scrollable';
@@ -467,7 +466,7 @@ export class TreeView extends HeightMap implements IScrollable {
 		this.items = {};
 
 		this.domNode = document.createElement('div');
-		this.domNode.className = 'monaco-tree';
+		this.domNode.className = 'monaco-tree no-focused-item';
 		this.domNode.tabIndex = 0;
 
 		// ARIA
@@ -1095,7 +1094,7 @@ export class TreeView extends HeightMap implements IScrollable {
 	private onModelFocusChange(): void {
 		const focus = this.model && this.model.getFocus();
 
-		DOM.toggleClass(this.domNode, 'no-item-focus', !focus);
+		DOM.toggleClass(this.domNode, 'no-focused-item', !focus);
 
 		// ARIA
 		if (focus) {
diff --git a/src/vs/workbench/electron-browser/media/shell.css b/src/vs/workbench/electron-browser/media/shell.css
index effce40c1fa..8d5f27d5f89 100644
--- a/src/vs/workbench/electron-browser/media/shell.css
+++ b/src/vs/workbench/electron-browser/media/shell.css
@@ -92,7 +92,7 @@
 	outline: 1px solid #007ACC; /* higher contrast color for focusable elements in a row that shows focus feedback */
 }
 
-.monaco-shell .monaco-tree.focused.no-item-focus:focus:before {
+.monaco-shell .monaco-tree.focused.no-focused-item:focus:before {
 	position: absolute;
 	top: 0;
 	left: 0;
@@ -103,17 +103,17 @@
 	pointer-events: none; /* enable click through */
 }
 
-.monaco-shell.vs .monaco-tree.focused.no-item-focus:focus:before {
+.monaco-shell.vs .monaco-tree.focused.no-focused-item:focus:before {
 	outline: 1px solid rgba(0, 122, 204, 0.4); /* we still need to handle the empty tree or no focus item case */
 	outline-offset: -1px;
 }
 
-.monaco-shell.vs-dark .monaco-tree.focused.no-item-focus:focus:before {
+.monaco-shell.vs-dark .monaco-tree.focused.no-focused-item:focus:before {
 	outline: 1px solid rgba(14, 99, 156, 0.6); /* we still need to handle the empty tree or no focus item case */
 	outline-offset: -1px;
 }
 
-.monaco-shell.hc-black .monaco-tree.focused.no-item-focus:focus:before {
+.monaco-shell.hc-black .monaco-tree.focused.no-focused-item:focus:before {
 	outline: 2px solid #DF740C; /* we still need to handle the empty tree or no focus item case */
 	outline-offset: -2px;
 }
@@ -141,7 +141,7 @@
 .monaco-shell input[type="submit"]:active,
 .monaco-shell input[type="checkbox"]:active,
 .monaco-shell .monaco-tree .monaco-tree-row .monaco-action-bar .action-item [tabindex="0"]:hover,
-.monaco-shell .monaco-tree.focused.no-item-focus:active:before {
+.monaco-shell .monaco-tree.focused.no-focused-item:active:before {
 	outline: 0 !important; /* fixes some flashing outlines from showing up when clicking */
 }
 
diff --git a/src/vs/workbench/parts/search/browser/searchViewlet.ts b/src/vs/workbench/parts/search/browser/searchViewlet.ts
index 51c3c8818f3..05ee08556f4 100644
--- a/src/vs/workbench/parts/search/browser/searchViewlet.ts
+++ b/src/vs/workbench/parts/search/browser/searchViewlet.ts
@@ -895,8 +895,8 @@ export class SearchViewlet extends Viewlet {
 				controller: new SearchController(),
 				accessibilityProvider: this.instantiationService.createInstance(SearchAccessibilityProvider)
 			}, {
-					ariaLabel: nls.localize('treeAriaLabel', "Search Results")
-				});
+				ariaLabel: nls.localize('treeAriaLabel', "Search Results")
+			});
 
 			this.toUnbind.push(() => renderer.dispose());