diff --git a/DesignerSpace/Workspace/FunctionLibraries/NodeChildren.js b/DesignerSpace/Workspace/FunctionLibraries/NodeChildren.js
index cc67770d1..215e30551 100644
--- a/DesignerSpace/Workspace/FunctionLibraries/NodeChildren.js
+++ b/DesignerSpace/Workspace/FunctionLibraries/NodeChildren.js
@@ -400,6 +400,12 @@ function newNodeChildren () {
         response.childIndex = response.childrenCount
       }
     }
+    if (parentNode.executionStartedEvent !== undefined) {
+      response.childrenCount++
+      if (parentNode.executionStartedEvent.id === childNode.id) {
+        response.childIndex = response.childrenCount
+      }
+    }
     if (parentNode.executionFinishedEvent !== undefined) {
       response.childrenCount++
       if (parentNode.executionFinishedEvent.id === childNode.id) {
diff --git a/DesignerSpace/Workspace/FunctionLibraries/OnFocus.js b/DesignerSpace/Workspace/FunctionLibraries/OnFocus.js
index c5a708b00..faa814eff 100644
--- a/DesignerSpace/Workspace/FunctionLibraries/OnFocus.js
+++ b/DesignerSpace/Workspace/FunctionLibraries/OnFocus.js
@@ -828,6 +828,10 @@ function newOnFocus () {
         if (child !== undefined) {
           return child
         }
+        child = getNodeThatIsOnFocus(node.executionStartedEvent)
+        if (child !== undefined) {
+          return child
+        }
         child = getNodeThatIsOnFocus(node.executionFinishedEvent)
         if (child !== undefined) {
           return child
diff --git a/DesignerSpace/Workspace/FunctionLibraries/ProtocolNode.js b/DesignerSpace/Workspace/FunctionLibraries/ProtocolNode.js
index 099fd9f5b..09ff5f75a 100644
--- a/DesignerSpace/Workspace/FunctionLibraries/ProtocolNode.js
+++ b/DesignerSpace/Workspace/FunctionLibraries/ProtocolNode.js
@@ -1172,6 +1172,7 @@ function newProtocolNode () {
           name: node.name,
           code: node.code,
           statusReport: getProtocolNode(node.statusReport, removePersonalData, parseCode, includeIds, includePayload, includeReferences),
+          executionStartedEvent: getProtocolNode(node.executionStartedEvent, removePersonalData, parseCode, includeIds, includePayload, includeReferences),
           executionFinishedEvent: getProtocolNode(node.executionFinishedEvent, removePersonalData, parseCode, includeIds, includePayload, includeReferences),
           calculations: getProtocolNode(node.calculations, removePersonalData, parseCode, includeIds, includePayload, includeReferences),
           dataBuilding: getProtocolNode(node.dataBuilding, removePersonalData, parseCode, includeIds, includePayload, includeReferences),
diff --git a/DesignerSpace/Workspace/FunctionLibraries/ShortcutKeys.js b/DesignerSpace/Workspace/FunctionLibraries/ShortcutKeys.js
index 725aa3407..e9fed8d1e 100644
--- a/DesignerSpace/Workspace/FunctionLibraries/ShortcutKeys.js
+++ b/DesignerSpace/Workspace/FunctionLibraries/ShortcutKeys.js
@@ -812,6 +812,10 @@ function newShortcutKeys () {
         if (child !== undefined) {
           return child
         }
+        child = getNodeByShortcutKey(node.executionStartedEvent, searchingKey)
+        if (child !== undefined) {
+          return child
+        }
         child = getNodeByShortcutKey(node.executionFinishedEvent, searchingKey)
         if (child !== undefined) {
           return child
diff --git a/DesignerSpace/Workspace/FunctionLibraries/UiObjectsFromNodes.js b/DesignerSpace/Workspace/FunctionLibraries/UiObjectsFromNodes.js
index ebdb03990..52bc86fb5 100644
--- a/DesignerSpace/Workspace/FunctionLibraries/UiObjectsFromNodes.js
+++ b/DesignerSpace/Workspace/FunctionLibraries/UiObjectsFromNodes.js
@@ -752,6 +752,9 @@ function newUiObjectsFromNodes () {
         if (node.statusReport !== undefined) {
           createUiObjectFromNode(node.statusReport, node, node)
         }
+        if (node.executionStartedEvent !== undefined) {
+          createUiObjectFromNode(node.executionStartedEvent, node, node)
+        }
         if (node.executionFinishedEvent !== undefined) {
           createUiObjectFromNode(node.executionFinishedEvent, node, node)
         }
@@ -1059,6 +1062,7 @@ function newUiObjectsFromNodes () {
 
   function addMissingProcessDefinitionItems (node) {
     addStatusReport(node)
+    addExecutionStartedEvent(node)
     addExecutionFinishedEvent(node)
     addCalculationsProcedure(node)
     addDataBuildingProcedure(node)