diff --git a/Dashboard.js b/Dashboard.js
index f2de0d950..61142d631 100644
--- a/Dashboard.js
+++ b/Dashboard.js
@@ -105,11 +105,15 @@ function newDashboard () {
   function setBrowserEvents () {
     window.onbeforeunload = onBrowserClosed
     function onBrowserClosed () {
-      let definition = canvas.strategySpace.workspace.definition
-      for (let i = 0; i < definition.taskManagers.length; i++) {
-        taskManager = definition.taskManagers[i]
-        taskManager.payload.uiObject.menu.internalClick('Stop All Tasks')
-      }
+      stopAllRunningTasks()
     }
   }
 }
+
+function stopAllRunningTasks () {
+  let definition = canvas.strategySpace.workspace.definition
+  for (let i = 0; i < definition.taskManagers.length; i++) {
+    taskManager = definition.taskManagers[i]
+    taskManager.payload.uiObject.menu.internalClick('Stop All Tasks')
+  }
+}
diff --git a/StrategySpace/Workspace/Workspace.js b/StrategySpace/Workspace/Workspace.js
index 0a31a8006..0dd9e4c87 100644
--- a/StrategySpace/Workspace/Workspace.js
+++ b/StrategySpace/Workspace/Workspace.js
@@ -150,6 +150,7 @@ function newWorkspace () {
       let droppedNode = JSON.parse(nodeText)
 
       if (droppedNode.type === 'Workspace') {
+        stopAllRunningTasks()
         functionLibraryNodeDeleter.deleteWorkspace(workspaceNode, workspaceNode.rootNodes)
         workspaceNode = droppedNode
         functionLibraryPartsFromNodes.createPartFromNode(workspaceNode, undefined, undefined)