diff --git a/plugins/tracker-resources/src/components/templates/CreateIssueTemplate.svelte b/plugins/tracker-resources/src/components/templates/CreateIssueTemplate.svelte
index e4bdc2e526..1db64df067 100644
--- a/plugins/tracker-resources/src/components/templates/CreateIssueTemplate.svelte
+++ b/plugins/tracker-resources/src/components/templates/CreateIssueTemplate.svelte
@@ -158,6 +158,7 @@
     milestone={object.milestone}
     project={_space}
     maxHeight="limited"
+    on:create-issue={({ detail }) => (object.children = [...object.children, detail])}
   />
   <svelte:fragment slot="pool">
     <PriorityEditor
diff --git a/plugins/tracker-resources/src/components/templates/IssueTemplateChildEditor.svelte b/plugins/tracker-resources/src/components/templates/IssueTemplateChildEditor.svelte
index 62e455aaeb..de890fd209 100644
--- a/plugins/tracker-resources/src/components/templates/IssueTemplateChildEditor.svelte
+++ b/plugins/tracker-resources/src/components/templates/IssueTemplateChildEditor.svelte
@@ -129,8 +129,8 @@
       {/key}
     </div>
   </div>
-  <div class="mt-4 flex-between">
-    <div class="buttons-group xsmall-gap">
+  <div class="mt-4 flex-between items-end">
+    <div class="inline-flex flex-wrap xsmall-gap">
       <PriorityEditor
         value={newIssue}
         shouldShowLabel
@@ -145,6 +145,7 @@
           value={newIssue}
           size="small"
           kind="no-border"
+          width="auto"
           on:change={({ detail }) => (newIssue.assignee = detail)}
         />
       {/key}
@@ -172,7 +173,7 @@
         }}
       />
     </div>
-    <div class="buttons-group small-gap">
+    <div class="ml-2 buttons-group small-gap">
       <Button label={presentation.string.Cancel} size="small" kind="transparent" on:click={close} />
       <Button
         disabled={!canSave}
@@ -184,3 +185,13 @@
     </div>
   </div>
 </div>
+
+<style lang="scss">
+  .xsmall-gap {
+    gap: 0.375rem;
+  }
+
+  .items-end {
+    align-items: flex-end;
+  }
+</style>