diff --git a/apps/remix-ide/src/app/panels/layout.ts b/apps/remix-ide/src/app/panels/layout.ts
index 90896c2041b..51149c38590 100644
--- a/apps/remix-ide/src/app/panels/layout.ts
+++ b/apps/remix-ide/src/app/panels/layout.ts
@@ -33,7 +33,9 @@ export class Layout extends Plugin {
   maximised: { [key: string]: boolean }
   constructor () {
     super(profile)
-    this.maximised = {}
+    this.maximised = {
+      'dgit': true
+    }
     this.event = new EventEmitter()
   }
 
@@ -65,7 +67,6 @@ export class Layout extends Plugin {
       this.event.emit('change', null)
     })
     this.on('tabs', 'openDiff', () => {
-      console.log('openDiff')
       this.panels.editor.active = true
       this.panels.main.active = false
       this.event.emit('change', null)
@@ -126,15 +127,15 @@ export class Layout extends Plugin {
   }
 
   async maximiseSidePanel () {
-    this.event.emit('maximisesidepanel')
     const current = await this.call('sidePanel', 'currentFocus')
     this.maximised[current] = true
+    this.event.emit('maximisesidepanel')
   }
 
   async maximisePinnedPanel () {
-    this.event.emit('maximisepinnedpanel')
     const current = await this.call('pinnedPanel', 'currentFocus')
     this.maximised[current] = true
+    this.event.emit('maximisepinnedpanel')
   }
 
   async maximizeTerminal() {
@@ -144,14 +145,14 @@ export class Layout extends Plugin {
   }
 
   async resetSidePanel () {
-    this.event.emit('resetsidepanel')
     const current = await this.call('sidePanel', 'currentFocus')
     this.maximised[current] = false
+    this.event.emit('resetsidepanel')
   }
 
   async resetPinnedPanel () {
-    this.event.emit('resetpinnedpanel')
     const current = await this.call('pinnedPanel', 'currentFocus')
     this.maximised[current] = false
+    this.event.emit('resetpinnedpanel')
   }
 }
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 0c57ebaffb4..009cb410b66 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
@@ -106,6 +105,7 @@ const DragBar = (props: IRemixDragBarUi) => {
         setTimeout(() => {
           props.setHideStatus(false)
           setDragBarPosX(offset + props.refObject.current.offsetWidth)
+          initialWidth.current = props.refObject.current.clientWidth
         }, 300)
       }
     } else if (props.layoutPosition === 'right') {
@@ -117,9 +117,11 @@ const DragBar = (props: IRemixDragBarUi) => {
         setTimeout(() => {
           props.setHideStatus(false)
           setDragBarPosX(props.refObject.current.offsetLeft)
+          initialWidth.current = props.refObject.current.clientWidth
         }, 300)
       }
     }
+
   }
 
   function startDrag() {
diff --git a/libs/remix-ui/git/src/lib/gitactions.ts b/libs/remix-ui/git/src/lib/gitactions.ts
index b9e0817bd1e..84b05f18e7a 100644
--- a/libs/remix-ui/git/src/lib/gitactions.ts
+++ b/libs/remix-ui/git/src/lib/gitactions.ts
@@ -852,6 +852,5 @@ export const clearGitLog = async () => {
 }
 
 export const setStorage = async (storage: storage) => {
-  console.log(storage)
   dispatch(setStoragePayload(storage))
 }
diff --git a/libs/remix-ui/git/src/lib/listeners.ts b/libs/remix-ui/git/src/lib/listeners.ts
index 37f8b9f3a00..6e88ba94fab 100644
--- a/libs/remix-ui/git/src/lib/listeners.ts
+++ b/libs/remix-ui/git/src/lib/listeners.ts
@@ -164,23 +164,6 @@ export const setCallBacks = (viewPlugin: Plugin, gitDispatcher: React.Dispatch<g
     setAtivePanel(panelNumber)
   })
 
-  plugin.on('sidePanel', 'focusChanged', async (name: string) => {
-    const pinnedPlugin = await plugin.call('pinnedPanel', 'currentFocus')
-    if (name == 'dgit') {
-      if (pinnedPlugin === 'dgit') {
-        plugin.call('layout', 'maximisePinnedPanel')
-      } else {
-        plugin.call('layout', 'maximiseSidePanel')
-      }
-    } else {
-      if (pinnedPlugin === 'dgit') {
-        plugin.call('layout', 'resetPinnedPanel')
-      } else {
-        plugin.call('layout', 'resetSidePanel')
-      }
-    }
-  })
-
   callBackEnabled = true;
 }
 
diff --git a/libs/remix-ui/statusbar/src/lib/remixui-statusbar-panel.tsx b/libs/remix-ui/statusbar/src/lib/remixui-statusbar-panel.tsx
index 082ea696948..bf9f2cb3bd8 100644
--- a/libs/remix-ui/statusbar/src/lib/remixui-statusbar-panel.tsx
+++ b/libs/remix-ui/statusbar/src/lib/remixui-statusbar-panel.tsx
@@ -31,7 +31,6 @@ export function RemixUIStatusBar({ statusBarPlugin }: RemixUIStatusBarProps) {
       mainAxis: true, padding: 10
     }), size({
       apply({ availableWidth, availableHeight, elements, ...state }) {
-        console.log(state)
         Object.assign(elements.floating.style, {
           maxWidth: `${availableWidth}`,
           maxHeight: `auto`