diff --git a/services/static-webserver/client/source/class/osparc/dashboard/ResourceBrowserBase.js b/services/static-webserver/client/source/class/osparc/dashboard/ResourceBrowserBase.js
index b63b1a12074..a52dc18a38a 100644
--- a/services/static-webserver/client/source/class/osparc/dashboard/ResourceBrowserBase.js
+++ b/services/static-webserver/client/source/class/osparc/dashboard/ResourceBrowserBase.js
@@ -386,7 +386,7 @@ qx.Class.define("osparc.dashboard.ResourceBrowserBase", {
         this._searchBarFilter.setSharedWithActiveFilter(sharedWith.id, sharedWith.label);
       }, this);
 
-      if (this._resourceType === "study") {
+      if (this._resourceType === "study" && osparc.utils.DisabledPlugins.isFoldersEnabled()) {
         const workspacesAndFoldersTree = resourceFilter.getWorkspacesAndFoldersTree();
         workspacesAndFoldersTree.getSelection().addListener("change", () => {
           const selection = workspacesAndFoldersTree.getSelection();
diff --git a/services/static-webserver/client/source/class/osparc/dashboard/ResourceFilter.js b/services/static-webserver/client/source/class/osparc/dashboard/ResourceFilter.js
index 234387a2f56..601de618d78 100644
--- a/services/static-webserver/client/source/class/osparc/dashboard/ResourceFilter.js
+++ b/services/static-webserver/client/source/class/osparc/dashboard/ResourceFilter.js
@@ -47,7 +47,7 @@ qx.Class.define("osparc.dashboard.ResourceFilter", {
     __serviceTypeButtons: null,
 
     __buildLayout: function() {
-      if (this.__resourceType === "study") {
+      if (this.__resourceType === "study" && osparc.utils.DisabledPlugins.isFoldersEnabled()) {
         this._add(this.__createWorkspacesAndFoldersTree());
       } else {
         this._add(this.__createSharedWithFilterLayout());
@@ -140,11 +140,6 @@ qx.Class.define("osparc.dashboard.ResourceFilter", {
               })
             });
           }
-          if (option.id !== "show-all") {
-            button.set({
-              marginLeft: 15
-            });
-          }
         }
         button.id = option.id;