diff --git a/module/task/js/create.ui.js b/module/task/js/create.ui.js
index 86b7746b89..6b61f23006 100644
--- a/module/task/js/create.ui.js
+++ b/module/task/js/create.ui.js
@@ -508,3 +508,12 @@ window.showAllModule = function()
         }
     });
 }
+
+window.closeModal = function(e)
+{
+    const $modal = $(e.target).closest('.modal');
+    if($modal.length == 0) return;
+
+    const modalID = $modal.attr('id');
+    zui.Modal.hide('#' + modalID);
+}
diff --git a/module/task/ui/create.html.php b/module/task/ui/create.html.php
index a796eeac67..91617b5c28 100644
--- a/module/task/ui/create.html.php
+++ b/module/task/ui/create.html.php
@@ -256,7 +256,7 @@ formPanel
     ),
     formRow
     (
-        $executionBox,
+        $executionBox ? $executionBox : formHidden('execution', $execution->id),
         formGroup
         (
             set::width('1/2'),