diff --git a/src/app.js b/src/app.js
index f0b963203e..36f663474e 100644
--- a/src/app.js
+++ b/src/app.js
@@ -454,7 +454,7 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
   )
   let analysis = new AnalysisTab(registry)
   let debug = new DebuggerTab()
-  const landingPage = new LandingPage(appManager, appStore, registry)
+  const landingPage = new LandingPage(appManager, appStore)
   let test = new TestTab(
     registry.get('filemanager').api,
     registry.get('filepanel').api,
diff --git a/src/app/ui/landing-page/landing-page.js b/src/app/ui/landing-page/landing-page.js
index c364e9f16e..f1aa8eb4d7 100644
--- a/src/app/ui/landing-page/landing-page.js
+++ b/src/app/ui/landing-page/landing-page.js
@@ -45,7 +45,7 @@ import Section from './section'
 
 export class LandingPage extends ApiFactory {
 
-  constructor (appManager, appStore, registry) {
+  constructor (appManager, appStore) {
     super()
     this.sections = []
     let load = function (item) {
diff --git a/src/app/ui/landing-page/workspace.js b/src/app/ui/landing-page/workspace.js
index a2cdf4779e..ed8b3f2d57 100644
--- a/src/app/ui/landing-page/workspace.js
+++ b/src/app/ui/landing-page/workspace.js
@@ -1,3 +1,5 @@
+let globalRegistry = require('../../../global/registry')
+
 export class Workspace {
   constructor (title, description, isMain, activate, deactivate) {
     this.title = title
@@ -8,7 +10,7 @@ export class Workspace {
   }
 }
 
-export const defaultWorkspaces = (appManager, registry) => {
+export const defaultWorkspaces = (appManager) => {
   return [
     new Workspace(
       'Solidity',
@@ -19,8 +21,8 @@ export const defaultWorkspaces = (appManager, registry) => {
         appManager.ensureActivated('run')
         appManager.ensureActivated('solidityStaticAnalysis')
         appManager.ensureActivated('solidityUnitTesting')
-        registry.get('filemanager').api.switchFile()
-        registry.get('verticalicon').api.select('solidity')
+        globalRegistry.get('filemanager').api.switchFile()
+        globalRegistry.get('verticalicon').api.select('solidity')
       }, () => {}),
     new Workspace(
       'Vyper',
@@ -29,8 +31,8 @@ export const defaultWorkspaces = (appManager, registry) => {
       () => {
         appManager.ensureActivated('vyper')
         appManager.ensureActivated('run')
-        registry.get('filemanager').api.switchFile()
-        registry.get('verticalicon').api.select('vyper')
+        globalRegistry.get('filemanager').api.switchFile()
+        globalRegistry.get('verticalicon').api.select('vyper')
       }, () => {}),
     new Workspace('Debugger', 'Debug transactions with remix', false, () => {
       appManager.ensureActivated('debugger')