diff --git a/services/static-webserver/client/source/class/osparc/dashboard/FolderButtonItem.js b/services/static-webserver/client/source/class/osparc/dashboard/FolderButtonItem.js
index e0b95b92acd..0261f0195fe 100644
--- a/services/static-webserver/client/source/class/osparc/dashboard/FolderButtonItem.js
+++ b/services/static-webserver/client/source/class/osparc/dashboard/FolderButtonItem.js
@@ -226,6 +226,7 @@ qx.Class.define("osparc.dashboard.FolderButtonItem", {
         const newName = folderEditor.getLabel();
         const updateData = {
           "name": newName,
+          "parentFolderId": folder.getParentFolderId(),
         };
         osparc.store.Folders.getInstance().putFolder(this.getFolderId(), updateData)
           .then(() => {
diff --git a/services/static-webserver/client/source/class/osparc/dashboard/MoveResourceToFolder.js b/services/static-webserver/client/source/class/osparc/dashboard/MoveResourceToFolder.js
index e01bc834776..06ebb83cfeb 100644
--- a/services/static-webserver/client/source/class/osparc/dashboard/MoveResourceToFolder.js
+++ b/services/static-webserver/client/source/class/osparc/dashboard/MoveResourceToFolder.js
@@ -36,10 +36,10 @@ qx.Class.define("osparc.dashboard.MoveResourceToFolder", {
       const folderId = e.getData();
       moveButton.setEnabled(this.__currentFolderId !== folderId);
       this.__selectedFolderId = folderId;
-    });
+    }, this);
     moveButton.addListener("execute", () => {
       this.fireDataEvent("moveToFolder", this.__selectedFolderId);
-    });
+    }, this);
   },
 
   events: {
@@ -55,7 +55,7 @@ qx.Class.define("osparc.dashboard.MoveResourceToFolder", {
       switch (id) {
         case "current-folder": {
           const folder = osparc.store.Folders.getInstance().getFolder(this.__currentFolderId);
-          const currentFolderName = folder ? folder["name"] : "Home";
+          const currentFolderName = folder ? folder.getName() : "Home";
           control = new qx.ui.basic.Label(this.tr("Current location: ") + currentFolderName);
           this._add(control);
           break;
diff --git a/services/static-webserver/client/source/class/osparc/dashboard/MoveResourceToWorkspace.js b/services/static-webserver/client/source/class/osparc/dashboard/MoveResourceToWorkspace.js
index ade091db85c..1eae08216bb 100644
--- a/services/static-webserver/client/source/class/osparc/dashboard/MoveResourceToWorkspace.js
+++ b/services/static-webserver/client/source/class/osparc/dashboard/MoveResourceToWorkspace.js
@@ -39,7 +39,7 @@ qx.Class.define("osparc.dashboard.MoveResourceToWorkspace", {
       } else {
         moveButton.setEnabled(false);
       }
-    });
+    }, this);
     moveButton.addListener("execute", () => {
       this.fireDataEvent("moveToWorkspace", this.__selectedWorkspaceId);
     }, this);
diff --git a/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js b/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js
index edf19d9cc38..87d2279afa4 100644
--- a/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js
+++ b/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js
@@ -496,19 +496,15 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
       const win = osparc.ui.window.Window.popUpInWindow(moveFolderToFolder, title, 350, 280);
       moveFolderToFolder.addListener("moveToFolder", e => {
         win.close();
+        const folder = osparc.store.Folders.getInstance().getFolder(folderId);
         const destFolderId = e.getData();
-        const params = {
-          url: {
-            folderId,
-            destFolderId,
-          }
+        const updatedData = {
+          name: folder.getName(),
+          parentFolderId: destFolderId,
         };
-        osparc.data.Resources.fetch("folders", "moveToFolder", params)
+        osparc.store.Folders.getInstance().putFolder(folderId, updatedData)
           .then(() => {
-            const folder = osparc.store.Folders.getInstance().getFolder(folderId);
-            if (folder) {
-              folder.setFolderId(destFolderId);
-            }
+            folder.setParentFolderId(destFolderId);
             this.__reloadFolders()
           })
           .catch(err => console.error(err));
diff --git a/services/static-webserver/client/source/class/osparc/data/Resources.js b/services/static-webserver/client/source/class/osparc/data/Resources.js
index 4507f936f88..770b5b48d27 100644
--- a/services/static-webserver/client/source/class/osparc/data/Resources.js
+++ b/services/static-webserver/client/source/class/osparc/data/Resources.js
@@ -320,10 +320,6 @@ qx.Class.define("osparc.data.Resources", {
             method: "DELETE",
             url: statics.API + "/folders/{folderId}"
           },
-          moveToFolder: {
-            method: "PUT",
-            url: statics.API + "/folders/{folderId}/folders/{destFolderId}"
-          },
           moveToWorkspace: {
             method: "PUT",
             url: statics.API + "/folders/{folderId}/folders/{workspaceId}"