diff --git a/DesignerSpace/Workspace/FunctionLibraries/UiObjectsFromNodes.js b/DesignerSpace/Workspace/FunctionLibraries/UiObjectsFromNodes.js
index f9d73e81d..372b729e0 100644
--- a/DesignerSpace/Workspace/FunctionLibraries/UiObjectsFromNodes.js
+++ b/DesignerSpace/Workspace/FunctionLibraries/UiObjectsFromNodes.js
@@ -352,6 +352,12 @@ function newUiObjectsFromNodes () {
       case 'Workspace': {
         let workspace = node
         createUiObject('Workspace', workspace.name, workspace, parentNode, chainParent, 'Workspace')
+        if (node.rootNodes !== undefined) {
+          for (let i = 0; i < node.rootNodes.length; i++) {
+            let rootNode = node.rootNodes[i]
+            createUiObjectFromNode(rootNode, undefined, undefined)
+          }
+        }
         return
       }
       case 'Personal Data': {
diff --git a/DesignerSpace/Workspace/Workspace.js b/DesignerSpace/Workspace/Workspace.js
index c087df957..0784efda2 100644
--- a/DesignerSpace/Workspace/Workspace.js
+++ b/DesignerSpace/Workspace/Workspace.js
@@ -87,10 +87,6 @@ function newWorkspace () {
       } else {
         thisObject.workspaceNode = JSON.parse(savedWorkspace)
         functionLibraryUiObjectsFromNodes.createUiObjectFromNode(thisObject.workspaceNode, undefined, undefined)
-        for (let i = 0; i < thisObject.workspaceNode.rootNodes.length; i++) {
-          let rootNode = thisObject.workspaceNode.rootNodes[i]
-          functionLibraryUiObjectsFromNodes.createUiObjectFromNode(rootNode, undefined, undefined)
-        }
         thisObject.enabled = true
       }
     } catch (err) {
@@ -228,10 +224,6 @@ function newWorkspace () {
         functionLibraryNodeDeleter.deleteWorkspace(thisObject.workspaceNode, thisObject.workspaceNode.rootNodes)
         thisObject.workspaceNode = droppedNode
         functionLibraryUiObjectsFromNodes.createUiObjectFromNode(thisObject.workspaceNode, undefined, undefined)
-        for (let i = 0; i < thisObject.workspaceNode.rootNodes.length; i++) {
-          let rootNode = thisObject.workspaceNode.rootNodes[i]
-          functionLibraryUiObjectsFromNodes.createUiObjectFromNode(rootNode, undefined, undefined)
-        }
       } else {
         let rootNode = functionLibraryProtocolNode.getProtocolNode(droppedNode)
         thisObject.workspaceNode.rootNodes.push(rootNode)