diff --git a/apps/remix-ide/src/app/components/main-panel.js b/apps/remix-ide/src/app/components/main-panel.js
index 53b6c0f94c..62d76cf4c3 100644
--- a/apps/remix-ide/src/app/components/main-panel.js
+++ b/apps/remix-ide/src/app/components/main-panel.js
@@ -24,6 +24,11 @@ export class MainPanel extends AbstractPanel {
     super(profile)
   }
 
+  focus (name) {
+    this.emit('focusChanged', name)
+    super.focus(name)
+  }
+
   render () {
     return yo`
       <div class=${css.pluginsContainer} data-id="mainPanelPluginsContainer">
diff --git a/apps/remix-ide/src/app/components/side-panel.js b/apps/remix-ide/src/app/components/side-panel.js
index b2a242ab7d..9df8dacb06 100644
--- a/apps/remix-ide/src/app/components/side-panel.js
+++ b/apps/remix-ide/src/app/components/side-panel.js
@@ -92,6 +92,7 @@ export class SidePanel extends AbstractPanel {
 
   focus (name) {
     this.emit('focusChanged', name)
+    super.focus(name)
   }
 
   removeView (profile) {
@@ -112,7 +113,6 @@ export class SidePanel extends AbstractPanel {
   async showContent (name) {
     super.showContent(name)
     this.renderHeader()
-    this.focus(name)
   }
 
   /** The header of the side panel */