diff --git a/src/app/panels/editor-panel.js b/src/app/panels/editor-panel.js
index 7e5b713ebb..92a93bca44 100644
--- a/src/app/panels/editor-panel.js
+++ b/src/app/panels/editor-panel.js
@@ -50,6 +50,13 @@ class EditorPanel {
       pluginManager: self._components.registry.get('pluginmanager').api
     }
     self.tabProxy = new TabProxy(self._deps.fileManager, self._components.editor, self.appStore, self.appManager)
+    let showApp = function(name){
+      self.mainPanelComponent.showContent(name)
+      self._view.editor.style.display = 'none'
+      self._components.contextView.hide()
+      self._view.mainPanel.style.display = 'block'
+    }
+    self.appManager.event.on('ensureActivated', (name) => { if(name === 'home') showApp(name)})
     /*
       We listen here on event from the tab component to display / hide the editor and mainpanel
       depending on the content that should be displayed
@@ -65,12 +72,7 @@ class EditorPanel {
     })
     self.tabProxy.event.on('closeFile', (file) => {
     })
-    self.tabProxy.event.on('switchApp', (name) => {
-      self.mainPanelComponent.showContent(name)
-      self._view.editor.style.display = 'none'
-      self._components.contextView.hide()
-      self._view.mainPanel.style.display = 'block'
-    })
+    self.tabProxy.event.on('switchApp', showApp)
     self.tabProxy.event.on('closeApp', (name) => {
       self._view.editor.style.display = 'block'
       self._components.contextView.hide()
diff --git a/src/app/tabs/compile-tab.js b/src/app/tabs/compile-tab.js
index 764a0442b6..a564bcd342 100644
--- a/src/app/tabs/compile-tab.js
+++ b/src/app/tabs/compile-tab.js
@@ -111,11 +111,12 @@ class CompileTab extends ApiFactory {
       if (data['error']) {
         this.renderer.error(data['error'].formattedMessage, this._view.errorContainer, {type: data['error'].severity || 'error'})
         if (data['error'].mode === 'panic') {
-          return modalDialogCustom.alert(yo`<div><i class="fa fa-exclamation-circle ${css.panicError}" aria-hidden="true"></i>
-                                            The compiler returned with the following internal error: <br> <b>${data['error'].formattedMessage}.<br>
-                                            The compiler might be in a non-sane state, please be careful and do not use further compilation data to deploy to mainnet.
-                                            It is heavily recommended to use another browser not affected by this issue (Firefox is known to not be affected).</b><br>
-                                            Please join <a href="https://gitter.im/ethereum/remix" target="blank" >remix gitter channel</a> for more information.</div>`)
+          return modalDialogCustom.alert(yo`
+            <div><i class="fa fa-exclamation-circle ${css.panicError}" aria-hidden="true"></i>
+            The compiler returned with the following internal error: <br> <b>${data['error'].formattedMessage}.<br>
+            The compiler might be in a non-sane state, please be careful and do not use further compilation data to deploy to mainnet.
+            It is heavily recommended to use another browser not affected by this issue (Firefox is known to not be affected).</b><br>
+            Please join <a href="https://gitter.im/ethereum/remix" target="blank" >remix gitter channel</a> for more information.</div>`)
         }
       }
       if (data.errors && data.errors.length) {
@@ -289,7 +290,10 @@ class CompileTab extends ApiFactory {
       })
       if (details[propertyName] !== '') {
         try {
-          node = yo`<div>${treeView.render(typeof details[propertyName] === 'object' ? details[propertyName] : JSON.parse(details[propertyName]))}</div>` // catch in case the parsing fails.
+          node = yo`
+          <div>
+            ${treeView.render(typeof details[propertyName] === 'object' ? details[propertyName] : JSON.parse(details[propertyName]))}
+          </div>` // catch in case the parsing fails.
         } catch (e) {
           node = yo`<div>Unable to display "${propertyName}": ${e.message}</div>`
         }
diff --git a/src/remixAppManager.js b/src/remixAppManager.js
index 65e8647384..73ee4e1d22 100644
--- a/src/remixAppManager.js
+++ b/src/remixAppManager.js
@@ -18,6 +18,7 @@ export class RemixAppManager extends AppManagerApi {
 
   ensureActivated (apiName) {
     if (!this.store.isActive(apiName)) this.activateOne(apiName)
+    this.event.emit('ensureActivated', apiName)
   }
 
   proxy () {