diff --git a/src/vs/workbench/electron-browser/bootstrap/index.js b/src/vs/workbench/electron-browser/bootstrap/index.js
index fce3512c554a29d112e395f5b1cbd294f830aa79..231a22d172e27732d4584d9d95e4c6c73baacaf5 100644
--- a/src/vs/workbench/electron-browser/bootstrap/index.js
+++ b/src/vs/workbench/electron-browser/bootstrap/index.js
@@ -96,14 +96,19 @@ function showPartsSplash(configuration) {
 		keep = true;
 	}
 
-	let structure = window.localStorage.getItem(key);
+	// TODO@Ben remove me after a while
+	perf.mark('willAccessLocalStorage');
+	let storage = window.localStorage;
+	perf.mark('didAccessLocalStorage');
+
+	let structure = storage.getItem(key);
 	if (structure) {
 		let splash = document.createElement('div');
 		splash.innerHTML = structure;
 		document.body.appendChild(splash);
 	}
 	if (!keep) {
-		window.localStorage.removeItem(key);
+		storage.removeItem(key);
 	}
 }
 
diff --git a/src/vs/workbench/electron-browser/main.ts b/src/vs/workbench/electron-browser/main.ts
index e8b8ff1a771bf06a5c2870fef51440114aaf28d0..e9ae397db28d1b267f43bf1cd4a04e50ed563d35 100644
--- a/src/vs/workbench/electron-browser/main.ts
+++ b/src/vs/workbench/electron-browser/main.ts
@@ -195,10 +195,7 @@ function createStorageService(workspaceService: IWorkspaceContextService, enviro
 	if (disableStorage) {
 		storage = inMemoryLocalStorageInstance;
 	} else {
-		// TODO@Ben remove me after a while
-		perf.mark('willAccessLocalStorage');
 		storage = window.localStorage;
-		perf.mark('didAccessLocalStorage');
 	}
 
 	return new StorageService(storage, storage, workspaceId, secondaryWorkspaceId);