diff --git a/src/app/pages/portal/expansion-panel/expansion-panel.component.ts b/src/app/pages/portal/expansion-panel/expansion-panel.component.ts
index c52f763d6..a00eb72b2 100644
--- a/src/app/pages/portal/expansion-panel/expansion-panel.component.ts
+++ b/src/app/pages/portal/expansion-panel/expansion-panel.component.ts
@@ -46,7 +46,7 @@ export class ExpansionPanelComponent {
 
   @HostBinding('class.app-expansion-panel-expanded')
   get hasExpandedClass() {
-    return this.expanded && !this.maximized;
+    return this.expanded;
   }
 
   @HostBinding('class.app-expansion-panel-expanded-maximized')
diff --git a/src/app/pages/portal/portal.component.html b/src/app/pages/portal/portal.component.html
index db7574d47..aa29faf2f 100644
--- a/src/app/pages/portal/portal.component.html
+++ b/src/app/pages/portal/portal.component.html
@@ -160,7 +160,7 @@
   *ngIf="hasExpansionPanel && (workspaceState.workspaceEnabled$ | async)"
   [backdropShown]="expansionPanelBackdropShown"
   [(expanded)]="expansionPanelExpanded"
-  [maximized]="workspaceMaximize$ | async"
+  [maximized]="workspaceState.workspaceMaximize$ | async"
   [@expansionPanelSize]="getExpansionPanelStatus()"
   [@toastOffsetY]="
     isMobile() &&
diff --git a/src/app/pages/portal/portal.component.ts b/src/app/pages/portal/portal.component.ts
index 75762033f..d697be649 100644
--- a/src/app/pages/portal/portal.component.ts
+++ b/src/app/pages/portal/portal.component.ts
@@ -148,7 +148,6 @@ export class PortalComponent implements OnInit, OnDestroy {
 
   public fullExtent: boolean;
   private workspaceMaximize$$: Subscription[] = [];
-  readonly workspaceMaximize$: BehaviorSubject<boolean>;
 
   public matDialogRef$ = new BehaviorSubject<MatDialogRef<any>>(undefined);
   public searchBarTerm = '';
@@ -347,9 +346,6 @@ export class PortalComponent implements OnInit, OnDestroy {
     private configFileToGeoDBService: ConfigFileToGeoDBService
   ) {
     this.fullExtent = this.storageService.get('fullExtent') as boolean;
-    this.workspaceMaximize$ = new BehaviorSubject(
-      this.storageService.get('workspaceMaximize') as boolean
-    );
     this._toastPanelOpened =
       (this.storageService.get('toastOpened') as boolean) !== false;
     this.hasExpansionPanel = this.configService.getConfig('hasExpansionPanel');
@@ -492,13 +488,9 @@ export class PortalComponent implements OnInit, OnDestroy {
 
     this.workspaceMaximize$$.push(
       this.workspaceState.workspaceMaximize$.subscribe((workspaceMaximize) => {
-        this.workspaceMaximize$.next(workspaceMaximize);
         this.updateMapBrowserClass();
       })
     );
-    this.workspaceMaximize$$.push(
-      this.workspaceMaximize$.subscribe(() => this.updateMapBrowserClass())
-    );
 
     this.workspaceState.workspace$.subscribe(
       (activeWks: WfsWorkspace | FeatureWorkspace | EditionWorkspace) => {
@@ -985,7 +977,7 @@ export class PortalComponent implements OnInit, OnDestroy {
     }
 
     if (this.hasExpansionPanel && this.expansionPanelExpanded) {
-      if (this.workspaceMaximize$.value) {
+      if (this.workspaceState.workspaceMaximize$.value) {
         this.mapBrowser.nativeElement.classList.add(
           'expansion-offset-maximized'
         );
@@ -997,7 +989,7 @@ export class PortalComponent implements OnInit, OnDestroy {
         );
       }
     } else {
-      if (this.workspaceMaximize$.value) {
+      if (this.workspaceState.workspaceMaximize$.value) {
         this.mapBrowser.nativeElement.classList.remove(
           'expansion-offset-maximized'
         );
@@ -1092,7 +1084,7 @@ export class PortalComponent implements OnInit, OnDestroy {
   getToastPanelOffsetY() {
     let status = 'noExpansion';
     if (this.expansionPanelExpanded) {
-      if (this.workspaceMaximize$.value) {
+      if (this.workspaceState.workspaceMaximize$.value) {
         if (this.toastPanelOpened) {
           status = 'expansionMaximizedAndToastOpened';
         } else {
@@ -1124,7 +1116,7 @@ export class PortalComponent implements OnInit, OnDestroy {
   }
   getControlsOffsetY() {
     return this.expansionPanelExpanded
-      ? this.workspaceMaximize$.value
+      ? this.workspaceState.workspaceMaximize$.value
         ? 'firstRowFromBottom-expanded-maximized'
         : 'firstRowFromBottom-expanded'
       : 'firstRowFromBottom';
@@ -1157,7 +1149,7 @@ export class PortalComponent implements OnInit, OnDestroy {
     } else {
       if (this.workspaceState.workspaceEnabled$.value) {
         if (this.expansionPanelExpanded) {
-          if (this.workspaceMaximize$.value) {
+          if (this.workspaceState.workspaceMaximize$.value) {
             status = 'firstRowFromBottom-expanded-maximized';
           } else {
             status = 'firstRowFromBottom-expanded';