diff --git a/DesignSpace/Workspace/FunctionLibraries/TaskFunctions.js b/DesignSpace/Workspace/FunctionLibraries/TaskFunctions.js
index f9a617a8a..4a83f27db 100644
--- a/DesignSpace/Workspace/FunctionLibraries/TaskFunctions.js
+++ b/DesignSpace/Workspace/FunctionLibraries/TaskFunctions.js
@@ -12,7 +12,7 @@ function newTaskFunctions () {
 
   return thisObject
 
-  function runTask (node, functionLibraryProtocolNode, callBackFunction) {
+  function runTask (node, functionLibraryProtocolNode, isDebugging, callBackFunction) {
     if (validations(node) !== true) {
       callBackFunction(GLOBAL.DEFAULT_FAIL_RESPONSE)
       return
@@ -64,8 +64,8 @@ function newTaskFunctions () {
       definition: JSON.stringify(definition) // <-  We need to do this workaround in order no to send unescaped charactars to the taskManager.
     }
 
-    if (node.payload.parentNode === undefined) {
-      callBackFunction(GLOBAL.DEFAULT_FAIL_RESPONSE)
+    if (isDebugging === true) {
+      callBackFunction(GLOBAL.DEFAULT_OK_RESPONSE)
       eventsServerClient.raiseEvent('Task Server', 'Debug Task Started', event)
       return
     }
diff --git a/DesignSpace/Workspace/Workspace.js b/DesignSpace/Workspace/Workspace.js
index d076dcb8f..a58fb46a1 100644
--- a/DesignSpace/Workspace/Workspace.js
+++ b/DesignSpace/Workspace/Workspace.js
@@ -406,10 +406,15 @@ function newWorkspace () {
           downloadText(fileName, text)
         }
 
+        break
+      case 'Debug Task':
+        {
+          functionLibraryTaskFunctions.runTask(payload.node, functionLibraryProtocolNode, true, callBackFunction)
+        }
         break
       case 'Run Task':
         {
-          functionLibraryTaskFunctions.runTask(payload.node, functionLibraryProtocolNode, callBackFunction)
+          functionLibraryTaskFunctions.runTask(payload.node, functionLibraryProtocolNode, false, callBackFunction)
         }
         break
       case 'Stop Task':