diff --git a/src/app/panels/editor-panel.js b/src/app/panels/editor-panel.js
index 1878572937..604c15d5e7 100644
--- a/src/app/panels/editor-panel.js
+++ b/src/app/panels/editor-panel.js
@@ -39,6 +39,12 @@ class EditorPanel {
       We listen here on event from the tab component to display / hide the editor and mainpanel
       depending on the content that should be displayed
     */
+    self._deps.fileManager.event.register('currentFileChanged', (file) => {
+      // we check upstream for "fileChanged"
+      self._view.editor.style.display = 'block'
+      self._components.contextView.show()
+      self._view.mainPanel.style.display = 'none'
+    })
     self.tabProxy.event.on('switchFile', (file) => {
       self._view.editor.style.display = 'block'
       self._components.contextView.show()
diff --git a/src/app/panels/tab-proxy.js b/src/app/panels/tab-proxy.js
index 2a268f3ea9..0161a91da1 100644
--- a/src/app/panels/tab-proxy.js
+++ b/src/app/panels/tab-proxy.js
@@ -37,7 +37,7 @@ export class TabProxy {
           this.event.emit('closeFile', file)
         })
       }
-      this.active(file)
+      this.active(file) // this put the css class "active"
     })
 
     fileManager.event.register('fileRenamed', (oldName, newName) => {