diff --git a/webui/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java b/webui/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java index b9691694f3..fa39b00308 100644 --- a/webui/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java +++ b/webui/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java @@ -649,7 +649,13 @@ public void setSkin(String skin) { public Set getPortletSkins() { // Determine portlets visible on the page List uiportlets = new ArrayList<>(); - uiWorkingWorkspace.findComponentOfType(uiportlets, UIPortlet.class); + getCurrentPage().findComponentOfType(uiportlets, UIPortlet.class); + if (!PortalRequestContext.getCurrentInstance().isMaximizePortlet()) { + getCurrentSite().findComponentOfType(uiportlets, UIPortlet.class); + } + if (!PortalRequestContext.getCurrentInstance().isHideSharedLayout()) { + uiWorkingWorkspace.findComponentOfType(uiportlets, UIPortlet.class); + } List portletSkins = new ArrayList<>(); Set portalPortletSkins = getPortalPortletSkins(); // don't merge portlet if portlet not available