diff --git a/src/app/panels/editor-panel.js b/src/app/panels/editor-panel.js
index fd0a50f15d..29640d36ba 100644
--- a/src/app/panels/editor-panel.js
+++ b/src/app/panels/editor-panel.js
@@ -55,8 +55,14 @@ class EditorPanel {
       self._view.editor.style.display = 'none'
       self._components.contextView.hide()
       self._view.mainPanel.style.display = 'block'
+      self.tabProxy.sh
     }
-    self.appManager.event.on('ensureActivated', (name) => { if (name === 'home') { showApp(name) } })
+    self.appManager.event.on('ensureActivated', (name) => {
+      if (name === 'home') {
+        showApp(name)
+        self.tabProxy.showTab('home')
+      }
+    })
     /*
       We listen here on event from the tab component to display / hide the editor and mainpanel
       depending on the content that should be displayed
diff --git a/src/app/panels/tab-proxy.js b/src/app/panels/tab-proxy.js
index dc731092e3..11ae370e01 100644
--- a/src/app/panels/tab-proxy.js
+++ b/src/app/panels/tab-proxy.js
@@ -99,6 +99,10 @@ export class TabProxy {
       }
     }
   }
+  
+  showTab(name) {
+    this._view.filetabs.activateTab(name)
+  }
 
   addTab (name, switchTo, close, kind) {
     var slash = name.split('/')