diff --git a/src/app/tabs/settings-tab.js b/src/app/tabs/settings-tab.js
index 6a8190585c..8721e78063 100644
--- a/src/app/tabs/settings-tab.js
+++ b/src/app/tabs/settings-tab.js
@@ -54,8 +54,7 @@ module.exports = class SettingsTab {
     self._deps.compiler.setOptimize(self.data.optimize)
     self.data.currentTheme = self._components.themeStorage.get('theme') || 'light'
 
-    var compilerEvent = self._components.registry.get('compiler').event
-    compilerEvent.register('compilerLoaded', (version) => self.setVersionText(version))
+    self._deps.compiler.event.register('compilerLoaded', (version) => self.setVersionText(version))
     self.fetchAllVersion((allversions, selectedVersion) => {
       self.data.allversions = allversions
       self.data.selectedVersion = selectedVersion
diff --git a/src/app/tabs/support-tab.js b/src/app/tabs/support-tab.js
index 85482c533d..1131e16e35 100644
--- a/src/app/tabs/support-tab.js
+++ b/src/app/tabs/support-tab.js
@@ -15,9 +15,12 @@ module.exports = class SupportTab {
     self.data = { gitterIsLoaded: false }
     self._components = {}
     self._components.registry = localRegistry || globalRegistry
+    
+    self._deps = {
+      app: self._components.registry.get('app').api
+    }
 
-    var appEvent = self._components.registry.get('app').event
-    appEvent.register('tabChanged', (tabName) => {
+    self._deps.app.event.register('tabChanged', (tabName) => {
       if (tabName !== 'Support' || self.data.gitterIsLoaded) return
       const iframe = yo`<iframe class="${css.chatIframe}" src='https://gitter.im/ethereum/remix/~embed'>`
       self._view.gitterIframe.parentNode.replaceChild(iframe, self._view.gitterIframe)
diff --git a/src/app/tabs/test-tab.js b/src/app/tabs/test-tab.js
index bdc0789a01..1c35be9aeb 100644
--- a/src/app/tabs/test-tab.js
+++ b/src/app/tabs/test-tab.js
@@ -12,13 +12,13 @@ module.exports = class TestTab {
     self._components.registry = localRegistry || globalRegistry
     // dependencies
     self._deps = {
-      fileManager: self._components.registry.get('filemanager').api
+      fileManager: self._components.registry.get('filemanager').api,
+      app: self._components.registry.get('app').api
     }
     self.data = {}
 
     self._view.el = self.render()
-    var appEvent = self._components.registry.get('app').event
-    appEvent.register('tabChanged', tabName => {
+    self._deps.app.event.register('tabChanged', tabName => {
       if (tabName !== 'test') return
       yo.update(self._view.el, self.render())
       self._view.el.style.display = 'block'