diff --git a/apps/remix-ide/src/app/components/pinned-panel.tsx b/apps/remix-ide/src/app/components/pinned-panel.tsx
index f435e03f69..0526ddf04f 100644
--- a/apps/remix-ide/src/app/components/pinned-panel.tsx
+++ b/apps/remix-ide/src/app/components/pinned-panel.tsx
@@ -44,8 +44,8 @@ export class PinnedPanel extends AbstractPanel {
     const activePlugin = this.currentFocus()
 
     if (activePlugin !== profile.name) throw new Error(`Plugin ${profile.name} already pinned`)
+    this.call('sidePanel', 'unPinView', profile, this.plugins[profile.name].view)
     super.remove(profile.name)
-    this.call('sidePanel', 'unPinView', profile)
     this.renderComponent()
     this.events.emit('unPinnedPlugin', profile.name)
   }
diff --git a/apps/remix-ide/src/app/components/side-panel.tsx b/apps/remix-ide/src/app/components/side-panel.tsx
index 9861b8f35c..11642fce57 100644
--- a/apps/remix-ide/src/app/components/side-panel.tsx
+++ b/apps/remix-ide/src/app/components/side-panel.tsx
@@ -72,34 +72,19 @@ export class SidePanel extends AbstractPanel {
     this.renderComponent()
   }
 
-  hideView(profile) {
-    this.plugins[profile.name].active = false
-    this.plugins['filePanel'].active = true
-    this.call('menuicons', 'unlinkContent', profile)
-    this.renderComponent()
+  pinView (profile) {
+    this.call('pinnedPanel', 'pinView', profile, this.plugins[profile.name].view)
+    this.removeView(profile)
   }
 
-  showView(profile) {
+  async unPinView (profile, view) {
+    this.addView(profile, view)
     const activePlugin = this.currentFocus()
 
     this.plugins[activePlugin].active = false
     this.plugins[profile.name].active = true
-    this.call('menuicons', 'linkContent', profile)
-    this.renderComponent()
-  }
-
-  pinView (profile) {
-    if (this.plugins[profile.name].pinned) return
-    this.plugins[profile.name].pinned = true
-    this.call('pinnedPanel', 'pinView', profile, this.plugins[profile.name].view)
-    this.removeView(profile)
-    // this.hideView(profile)
-  }
-
-  unPinView (profile) {
-    if (!this.plugins[profile.name].pinned) return
-    this.plugins[profile.name].pinned = false
-    this.showView(profile)
+    await this.call('menuicons', 'linkContent', profile)
+    this.showContent(profile.name)
   }
 
   /**