diff --git a/src/vs/workbench/browser/web.main.ts b/src/vs/workbench/browser/web.main.ts
index d33b249cc98f9ae12793b4f62937bfcbf6b24db4..6f1954ba2520aa573b769bd5e0b23bfe13736191 100644
--- a/src/vs/workbench/browser/web.main.ts
+++ b/src/vs/workbench/browser/web.main.ts
@@ -36,7 +36,6 @@ import { SignService } from 'vs/platform/sign/browser/signService';
 import { hash } from 'vs/base/common/hash';
 import { IWorkbenchConstructionOptions } from 'vs/workbench/workbench.web.api';
 import { ProductService } from 'vs/platform/product/browser/productService';
-import { setFullscreen } from 'vs/base/browser/browser';
 
 class CodeRendererMain extends Disposable {
 
@@ -64,13 +63,6 @@ class CodeRendererMain extends Disposable {
 
 		// Layout
 		this._register(addDisposableListener(window, EventType.RESIZE, () => this.workbench.layout()));
-		this._register(addDisposableListener(document, EventType.FULLSCREEN_CHANGE, () => {
-			if (document.fullscreenElement || (<any>document).webkitFullscreenElement) {
-				setFullscreen(true);
-			} else {
-				setFullscreen(false);
-			}
-		}));
 
 		// Resource Loading
 		this._register(new WebResources(<IFileService>services.serviceCollection.get(IFileService)));
diff --git a/src/vs/workbench/browser/web.simpleservices.ts b/src/vs/workbench/browser/web.simpleservices.ts
index fd3d7c637cc3a191589fc6fd9a7502931c5327c4..cb1eb5999ed5180633856439ec7d313b7c3a7d46 100644
--- a/src/vs/workbench/browser/web.simpleservices.ts
+++ b/src/vs/workbench/browser/web.simpleservices.ts
@@ -45,6 +45,7 @@ import { CommentingRanges } from 'vs/editor/common/modes';
 import { Range } from 'vs/editor/common/core/range';
 import { isUndefinedOrNull } from 'vs/base/common/types';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
+import { addDisposableListener, EventType } from 'vs/base/browser/dom';
 
 //#region Backup File
 
@@ -724,7 +725,7 @@ registerSingleton(IURLService, SimpleURLService);
 
 //#region Window
 
-export class SimpleWindowService implements IWindowService {
+export class SimpleWindowService extends Disposable implements IWindowService {
 
 	_serviceBrand: any;
 
@@ -735,6 +736,18 @@ export class SimpleWindowService implements IWindowService {
 
 	readonly windowId = 0;
 
+	constructor() {
+		super();
+
+		this._register(addDisposableListener(document, EventType.FULLSCREEN_CHANGE, () => {
+			if (document.fullscreenElement || (<any>document).webkitFullscreenElement) {
+				browser.setFullscreen(true);
+			} else {
+				browser.setFullscreen(false);
+			}
+		}));
+	}
+
 	isFocused(): Promise<boolean> {
 		return Promise.resolve(this.hasFocus);
 	}