diff --git a/apps/remix-ide/src/app/components/vertical-icons.tsx b/apps/remix-ide/src/app/components/vertical-icons.tsx
index 3f71eabec3..865c4fa468 100644
--- a/apps/remix-ide/src/app/components/vertical-icons.tsx
+++ b/apps/remix-ide/src/app/components/vertical-icons.tsx
@@ -16,8 +16,6 @@ const profile = {
   events: ['toggleContent', 'showContent']
 }
 
-const toMaximize = ['LearnEth', 'udapp', 'debugger', 'solidityStaticAnalysis', 'solidityUnitTesting', 'cookbookdev']
-
 export class VerticalIcons extends Plugin {
   events: EventEmitter
   htmlElement: HTMLDivElement
@@ -128,11 +126,6 @@ export class VerticalIcons extends Plugin {
     // TODO: Only keep `this.emit` (issue#2210)
     this.emit('showContent', name)
     this.events.emit('showContent', name)
-    if (toMaximize.includes(name)) {
-      setTimeout(_ => {
-        this.call('layout', 'maximiseSidePanel')
-      }, 500)
-    }
   }
 
   /**
diff --git a/apps/remix-ide/src/app/panels/layout.ts b/apps/remix-ide/src/app/panels/layout.ts
index 90896c2041..2f8890a2ef 100644
--- a/apps/remix-ide/src/app/panels/layout.ts
+++ b/apps/remix-ide/src/app/panels/layout.ts
@@ -9,6 +9,8 @@ const profile: Profile = {
   methods: ['minimize', 'maximiseSidePanel', 'resetSidePanel', 'maximizeTerminal', 'maximisePinnedPanel', 'resetPinnedPanel']
 }
 
+const toMaximize = ['LearnEth', 'udapp', 'debugger', 'solidityStaticAnalysis', 'solidityUnitTesting', 'cookbookdev']
+
 interface panelState {
   active: boolean
   plugin: Plugin
@@ -30,10 +32,12 @@ export type PanelConfiguration = {
 export class Layout extends Plugin {
   event: any
   panels: panels
-  maximised: { [key: string]: boolean }
+  pinnedPanelMaximized: boolean
+  sidePanelMaximized: boolean
   constructor () {
     super(profile)
-    this.maximised = {}
+    this.pinnedPanelMaximized = false
+    this.sidePanelMaximized = false
     this.event = new EventEmitter()
   }
 
@@ -78,21 +82,33 @@ export class Layout extends Plugin {
       }
     })
     this.on('sidePanel', 'focusChanged', async (name) => {
-      const current = await this.call('sidePanel', 'currentFocus')
-      if (this.maximised[current]) {
-        this.event.emit('maximisesidepanel')
+      if (toMaximize.includes(name) && !this.sidePanelMaximized) {
+        setTimeout(() => { 
+          this.maximiseSidePanel()
+          this.resetPinnedPanel()
+        }, 0)
+        this.sidePanelMaximized = true
       } else {
-        this.event.emit('resetsidepanel')
-      }
+        setTimeout(() => { 
+          this.resetSidePanel()
+        }, 0)
+        this.sidePanelMaximized = false
+      }   
     })
 
-    this.on('pinnedPanel', 'pinnedPlugin', async (name) => {
-      const current = await this.call('pinnedPanel', 'currentFocus')
-      if (this.maximised[current]) {
-        this.event.emit('maximisepinnedpanel')
+    this.on('pinnedPanel', 'pinnedPlugin', async (profile) => {
+      if (toMaximize.includes(profile.name) && !this.pinnedPanelMaximized) {
+        setTimeout(() => { 
+          this.maximisePinnedPanel()
+          this.resetSidePanel()
+        }, 0)
+        this.pinnedPanelMaximized = true
       } else {
-        this.event.emit('resetpinnedpanel')
-      }
+        setTimeout(() => { 
+          this.resetPinnedPanel()
+        }, 0)
+        this.pinnedPanelMaximized = false
+      }      
     })
 
     document.addEventListener('keypress', e => {
@@ -127,14 +143,10 @@ export class Layout extends Plugin {
 
   async maximiseSidePanel () {
     this.event.emit('maximisesidepanel')
-    const current = await this.call('sidePanel', 'currentFocus')
-    this.maximised[current] = true
   }
 
   async maximisePinnedPanel () {
     this.event.emit('maximisepinnedpanel')
-    const current = await this.call('pinnedPanel', 'currentFocus')
-    this.maximised[current] = true
   }
 
   async maximizeTerminal() {
@@ -145,13 +157,9 @@ export class Layout extends Plugin {
 
   async resetSidePanel () {
     this.event.emit('resetsidepanel')
-    const current = await this.call('sidePanel', 'currentFocus')
-    this.maximised[current] = false
   }
 
   async resetPinnedPanel () {
     this.event.emit('resetpinnedpanel')
-    const current = await this.call('pinnedPanel', 'currentFocus')
-    this.maximised[current] = false
   }
 }
diff --git a/libs/remix-ui/app/src/lib/remix-app/components/dragbar/dragbar.tsx b/libs/remix-ui/app/src/lib/remix-app/components/dragbar/dragbar.tsx
index 0c57ebaffb..4c783c8a02 100644
--- a/libs/remix-ui/app/src/lib/remix-app/components/dragbar/dragbar.tsx
+++ b/libs/remix-ui/app/src/lib/remix-app/components/dragbar/dragbar.tsx
@@ -41,7 +41,6 @@ const DragBar = (props: IRemixDragBarUi) => {
   }, [props.hidden, offset])
 
   useEffect(() => {
-    initialWidth.current = props.refObject.current.clientWidth
     if (props.maximiseTrigger > 0) {
       if (props.layoutPosition === 'left') {
         const width = 0.4 * window.innerWidth