diff --git a/DesignerSpace/Workspace/FunctionLibraries/UiObjectsFromNodes.js b/DesignerSpace/Workspace/FunctionLibraries/UiObjectsFromNodes.js
index fc5e63278..5df4ecd6a 100644
--- a/DesignerSpace/Workspace/FunctionLibraries/UiObjectsFromNodes.js
+++ b/DesignerSpace/Workspace/FunctionLibraries/UiObjectsFromNodes.js
@@ -13,7 +13,7 @@ function newUiObjectsFromNodes () {
 
   return thisObject
 
-  function recreateWorkspace (node) {
+  function recreateWorkspace (node, replacingCurrentWorkspace) {
     mapOfNodes = new Map()
     tasksToRun = []
 
@@ -28,7 +28,11 @@ function newUiObjectsFromNodes () {
 
     tryToConnectChildrenWithReferenceParents()
 
-    setTimeout(runTasks, 70000) // We need to wait all tasks that were potentially running to stop
+    if (replacingCurrentWorkspace === true) {
+      setTimeout(runTasks, 70000) // We need to wait all tasks that were potentially running to stop
+    } else {
+      runTasks()
+    }
   }
 
   function runTasks () {
diff --git a/DesignerSpace/Workspace/Workspace.js b/DesignerSpace/Workspace/Workspace.js
index 93985c5ac..d0912847e 100644
--- a/DesignerSpace/Workspace/Workspace.js
+++ b/DesignerSpace/Workspace/Workspace.js
@@ -132,7 +132,7 @@ function newWorkspace () {
           workingAtTask++
           break
         case 4:
-          functionLibraryUiObjectsFromNodes.recreateWorkspace(thisObject.workspaceNode)
+          functionLibraryUiObjectsFromNodes.recreateWorkspace(thisObject.workspaceNode, true)
           workingAtTask++
           break
         case 5: