diff --git a/CHANGELOG.md b/CHANGELOG.md
index 135f7f3e87..b5d55c346a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,7 +22,7 @@ All notable changes to the Wazuh app project will be documented in this file.
 
 ### Changed
 
-- Removed embedded discover [#6120](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6120) [#6235](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6235) [#6254](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6254) [#6285](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6285) [#6288](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6288) [#6290](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6290) [#6289](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6289) [#6286](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6286) [#6275](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6275) [#6287](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6287) [#6297](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6297) [#6291](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6287) [#6459](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6459) [#6434](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6434) [#6504](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6504) [#6649](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6649) [#6506](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6506) [#6537](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6537) [#6528](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6528) [#6675](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6675) [#6674](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6674) [#6558](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6558) [#6685](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6685) [#6691](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6691) [#6712](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6712) [#6734](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6734) [#6746](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6746) [#6752](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6752) [#6753](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6753) [#6756](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6756) [#6771](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6771) [#6792](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6792) [#6845](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6845) [#6857](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6857) [#6847](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6847)
+- Removed embedded discover [#6120](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6120) [#6235](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6235) [#6254](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6254) [#6285](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6285) [#6288](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6288) [#6290](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6290) [#6289](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6289) [#6286](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6286) [#6275](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6275) [#6287](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6287) [#6297](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6297) [#6291](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6287) [#6459](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6459) [#6434](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6434) [#6504](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6504) [#6649](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6649) [#6506](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6506) [#6537](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6537) [#6528](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6528) [#6675](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6675) [#6674](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6674) [#6558](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6558) [#6685](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6685) [#6691](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6691) [#6712](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6712) [#6734](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6734) [#6746](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6746) [#6752](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6752) [#6753](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6753) [#6756](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6756) [#6771](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6771) [#6792](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6792) [#6845](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6845) [#6857](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6857) [#6847](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6847) [#6865](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6865)
 - Allow editing groups for an agent from Endpoints Summary [#6250](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6250)
 - Change how the configuration is managed in the backend side [#6337](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6337) [#6519](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6519) [#6573](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6573)
 - Change the view of API is down and check connection to Server APIs application [#6337](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6337)
diff --git a/plugins/main/public/components/common/wazuh-discover/discover.scss b/plugins/main/public/components/common/wazuh-discover/discover.scss
index 1bd68be0bc..f1dbfb1998 100644
--- a/plugins/main/public/components/common/wazuh-discover/discover.scss
+++ b/plugins/main/public/components/common/wazuh-discover/discover.scss
@@ -16,12 +16,5 @@
 
   .discoverChartContainer {
     min-height: 234px;
-    .dshLayout-isMaximizedPanel {
-      top: 0;
-      left: 0;
-      min-height: calc(100vh - 49px);
-      position: fixed;
-      z-index: 9999;
-    }
   }
 }
diff --git a/plugins/main/public/components/management/cluster/dashboard/cluster_dashboard.scss b/plugins/main/public/components/management/cluster/dashboard/cluster_dashboard.scss
index ccb47c4acb..34639f01a3 100644
--- a/plugins/main/public/components/management/cluster/dashboard/cluster_dashboard.scss
+++ b/plugins/main/public/components/management/cluster/dashboard/cluster_dashboard.scss
@@ -5,7 +5,7 @@
       height: auto !important;
     }
     .dshLayout-isMaximizedPanel {
-      height: 100% !important;
+      height: calc(100vh - 44px) !important;
     }
   }
 }
diff --git a/plugins/main/public/components/overview/amazon-web-services/dashboards/styles.scss b/plugins/main/public/components/overview/amazon-web-services/dashboards/styles.scss
index 18697c1dce..c297a0b12b 100644
--- a/plugins/main/public/components/overview/amazon-web-services/dashboards/styles.scss
+++ b/plugins/main/public/components/overview/amazon-web-services/dashboards/styles.scss
@@ -4,7 +4,7 @@
       height: auto !important;
     }
     .dshLayout-isMaximizedPanel {
-      height: 100% !important;
+      height: calc(100vh - 44px) !important;
     }
   }
 }
diff --git a/plugins/main/public/components/overview/docker/dashboards/styles.scss b/plugins/main/public/components/overview/docker/dashboards/styles.scss
index f8ee063233..32ac151690 100644
--- a/plugins/main/public/components/overview/docker/dashboards/styles.scss
+++ b/plugins/main/public/components/overview/docker/dashboards/styles.scss
@@ -4,7 +4,7 @@
       height: auto !important;
     }
     .dshLayout-isMaximizedPanel {
-      height: 100% !important;
+      height: calc(100vh - 44px) !important;
     }
   }
 }
diff --git a/plugins/main/public/components/overview/fim/dashboard/styles.scss b/plugins/main/public/components/overview/fim/dashboard/styles.scss
index 7b072729a2..389626d616 100644
--- a/plugins/main/public/components/overview/fim/dashboard/styles.scss
+++ b/plugins/main/public/components/overview/fim/dashboard/styles.scss
@@ -4,7 +4,7 @@
       height: auto !important;
     }
     .dshLayout-isMaximizedPanel {
-      height: 100% !important;
+      height: calc(100vh - 44px) !important;
     }
   }
 }
diff --git a/plugins/main/public/components/overview/gdpr/dashboards/styles.scss b/plugins/main/public/components/overview/gdpr/dashboards/styles.scss
index a198ad811f..229dd2d9ec 100644
--- a/plugins/main/public/components/overview/gdpr/dashboards/styles.scss
+++ b/plugins/main/public/components/overview/gdpr/dashboards/styles.scss
@@ -4,7 +4,7 @@
       height: auto !important;
     }
     .dshLayout-isMaximizedPanel {
-      height: 100% !important;
+      height: calc(100vh - 44px) !important;
     }
   }
 }
diff --git a/plugins/main/public/components/overview/github/dashboards/styles.scss b/plugins/main/public/components/overview/github/dashboards/styles.scss
index 4a4bec26ba..3cbf8eb692 100644
--- a/plugins/main/public/components/overview/github/dashboards/styles.scss
+++ b/plugins/main/public/components/overview/github/dashboards/styles.scss
@@ -4,7 +4,7 @@
       height: auto !important;
     }
     .dshLayout-isMaximizedPanel {
-      height: 100% !important;
+      height: calc(100vh - 44px) !important;
     }
   }
 }
diff --git a/plugins/main/public/components/overview/google-cloud/dashboards/styles.scss b/plugins/main/public/components/overview/google-cloud/dashboards/styles.scss
index 89e050cb20..3041d008ec 100644
--- a/plugins/main/public/components/overview/google-cloud/dashboards/styles.scss
+++ b/plugins/main/public/components/overview/google-cloud/dashboards/styles.scss
@@ -4,7 +4,7 @@
       height: auto !important;
     }
     .dshLayout-isMaximizedPanel {
-      height: 100% !important;
+      height: calc(100vh - 44px) !important;
     }
   }
 }
diff --git a/plugins/main/public/components/overview/hipaa/dashboards/styles.scss b/plugins/main/public/components/overview/hipaa/dashboards/styles.scss
index 5251debd25..8d5c850990 100644
--- a/plugins/main/public/components/overview/hipaa/dashboards/styles.scss
+++ b/plugins/main/public/components/overview/hipaa/dashboards/styles.scss
@@ -4,7 +4,7 @@
       height: auto !important;
     }
     .dshLayout-isMaximizedPanel {
-      height: 100% !important;
+      height: calc(100vh - 44px) !important;
     }
   }
 }
diff --git a/plugins/main/public/components/overview/malware-detection/dashboard/styles.scss b/plugins/main/public/components/overview/malware-detection/dashboard/styles.scss
index 961a8c5f4b..b5727f4276 100644
--- a/plugins/main/public/components/overview/malware-detection/dashboard/styles.scss
+++ b/plugins/main/public/components/overview/malware-detection/dashboard/styles.scss
@@ -4,7 +4,7 @@
       height: auto !important;
     }
     .dshLayout-isMaximizedPanel {
-      height: 100% !important;
+      height: calc(100vh - 44px) !important;
     }
   }
 }
diff --git a/plugins/main/public/components/overview/mitre/dashboard/mitre_dashboard_filters.scss b/plugins/main/public/components/overview/mitre/dashboard/mitre_dashboard_filters.scss
index 8d156a0937..791042a695 100644
--- a/plugins/main/public/components/overview/mitre/dashboard/mitre_dashboard_filters.scss
+++ b/plugins/main/public/components/overview/mitre/dashboard/mitre_dashboard_filters.scss
@@ -14,7 +14,7 @@
       height: auto !important;
     }
     .dshLayout-isMaximizedPanel {
-      height: 100% !important;
+      height: calc(100vh - 44px) !important;
     }
   }
 }
diff --git a/plugins/main/public/components/overview/nist/dashboards/styles.scss b/plugins/main/public/components/overview/nist/dashboards/styles.scss
index 6630bbc35b..5431432b2a 100644
--- a/plugins/main/public/components/overview/nist/dashboards/styles.scss
+++ b/plugins/main/public/components/overview/nist/dashboards/styles.scss
@@ -4,7 +4,7 @@
       height: auto !important;
     }
     .dshLayout-isMaximizedPanel {
-      height: 100% !important;
+      height: calc(100vh - 44px) !important;
     }
   }
 }
diff --git a/plugins/main/public/components/overview/office/dashboard/styles.scss b/plugins/main/public/components/overview/office/dashboard/styles.scss
index b47665524a..3f235ab0ea 100644
--- a/plugins/main/public/components/overview/office/dashboard/styles.scss
+++ b/plugins/main/public/components/overview/office/dashboard/styles.scss
@@ -4,7 +4,7 @@
       height: auto !important;
     }
     .dshLayout-isMaximizedPanel {
-      height: 100% !important;
+      height: calc(100vh - 44px) !important;
     }
   }
 }
diff --git a/plugins/main/public/components/overview/pci/dashboards/styles.scss b/plugins/main/public/components/overview/pci/dashboards/styles.scss
index a3b1005567..77d26b2671 100644
--- a/plugins/main/public/components/overview/pci/dashboards/styles.scss
+++ b/plugins/main/public/components/overview/pci/dashboards/styles.scss
@@ -4,7 +4,7 @@
       height: auto !important;
     }
     .dshLayout-isMaximizedPanel {
-      height: 100% !important;
+      height: calc(100vh - 44px) !important;
     }
   }
 }
diff --git a/plugins/main/public/components/overview/server-management-statistics/dashboards/statistics_dashboard.scss b/plugins/main/public/components/overview/server-management-statistics/dashboards/statistics_dashboard.scss
index 1d997a00e4..a1fb779e1f 100644
--- a/plugins/main/public/components/overview/server-management-statistics/dashboards/statistics_dashboard.scss
+++ b/plugins/main/public/components/overview/server-management-statistics/dashboards/statistics_dashboard.scss
@@ -4,7 +4,7 @@
       height: auto !important;
     }
     .dshLayout-isMaximizedPanel {
-      height: 100% !important;
+      height: calc(100vh - 44px) !important;
     }
   }
 }
diff --git a/plugins/main/public/components/overview/threat-hunting/dashboard/threat_hunting_dashboard.scss b/plugins/main/public/components/overview/threat-hunting/dashboard/threat_hunting_dashboard.scss
index a44ea6bd14..8758c9a143 100644
--- a/plugins/main/public/components/overview/threat-hunting/dashboard/threat_hunting_dashboard.scss
+++ b/plugins/main/public/components/overview/threat-hunting/dashboard/threat_hunting_dashboard.scss
@@ -4,7 +4,7 @@
       height: auto !important;
     }
     .dshLayout-isMaximizedPanel {
-      height: 100% !important;
+      height: calc(100vh - 44px) !important;
     }
   }
 }
diff --git a/plugins/main/public/components/overview/tsc/dashboards/styles.scss b/plugins/main/public/components/overview/tsc/dashboards/styles.scss
index 493a31c311..bdf2a000a6 100644
--- a/plugins/main/public/components/overview/tsc/dashboards/styles.scss
+++ b/plugins/main/public/components/overview/tsc/dashboards/styles.scss
@@ -4,7 +4,7 @@
       height: auto !important;
     }
     .dshLayout-isMaximizedPanel {
-      height: 100% !important;
+      height: calc(100vh - 44px) !important;
     }
   }
 }
diff --git a/plugins/main/public/components/overview/virustotal/dashboard/virustotal_dashboard.scss b/plugins/main/public/components/overview/virustotal/dashboard/virustotal_dashboard.scss
index 0802d38593..6e8f3eab43 100644
--- a/plugins/main/public/components/overview/virustotal/dashboard/virustotal_dashboard.scss
+++ b/plugins/main/public/components/overview/virustotal/dashboard/virustotal_dashboard.scss
@@ -4,7 +4,7 @@
       height: auto !important;
     }
     .dshLayout-isMaximizedPanel {
-      height: 100% !important;
+      height: calc(100vh - 44px) !important;
     }
   }
 }
diff --git a/plugins/main/public/components/overview/vulnerabilities/dashboards/overview/vulnerability_detector_filters.scss b/plugins/main/public/components/overview/vulnerabilities/dashboards/overview/vulnerability_detector_filters.scss
index 996f0272b2..dc9616a146 100644
--- a/plugins/main/public/components/overview/vulnerabilities/dashboards/overview/vulnerability_detector_filters.scss
+++ b/plugins/main/public/components/overview/vulnerabilities/dashboards/overview/vulnerability_detector_filters.scss
@@ -14,7 +14,7 @@
       height: auto !important;
     }
     .dshLayout-isMaximizedPanel {
-      height: 100% !important;
+      height: calc(100vh - 44px) !important;
     }
   }
 }
diff --git a/plugins/main/public/styles/common.scss b/plugins/main/public/styles/common.scss
index c2de869880..69f2be672e 100644
--- a/plugins/main/public/styles/common.scss
+++ b/plugins/main/public/styles/common.scss
@@ -1813,11 +1813,17 @@ iframe.width-changed {
 
 /* Workaround to fix maximize embeddable dashboard */
 .wz-app .dshLayout-isMaximizedPanel {
-  top: 0;
-  left: 0;
+  height: calc(100vh - 49px) !important;
+  bottom: 0;
+  right: 0;
+  position: fixed !important;
   z-index: 9999;
 }
 
+.euiBody--hasFlyout .wz-app .dshLayout-isMaximizedPanel {
+  width: calc(100% - 320px) !important;
+}
+
 .wz-app {
   .euiPage {
     background-color: transparent;