diff --git a/plugins/tracker-resources/src/components/issues/edit/SubIssueList.svelte b/plugins/tracker-resources/src/components/issues/edit/SubIssueList.svelte
index 60dc0f0909..f8e3d5df9e 100644
--- a/plugins/tracker-resources/src/components/issues/edit/SubIssueList.svelte
+++ b/plugins/tracker-resources/src/components/issues/edit/SubIssueList.svelte
@@ -27,6 +27,7 @@
   import PriorityEditor from '../PriorityEditor.svelte'
   import StatusEditor from '../StatusEditor.svelte'
   import EstimationEditor from '../timereport/EstimationEditor.svelte'
+  import SubIssuesSelector from './SubIssuesSelector.svelte'
 
   export let issues: Issue[]
 
@@ -134,6 +135,9 @@
       <span class="text name" title={issue.title} on:click={openIssueCall}>
         {issue.title}
       </span>
+      {#if issue.subIssues > 0}
+        <SubIssuesSelector value={issue} {currentTeam} statuses={issueStatuses.get(issue.space)} />
+      {/if}
     </div>
     <div class="flex-center flex-no-shrink">
       <EstimationEditor value={issue} kind={'list'} />
diff --git a/plugins/tracker-resources/src/components/issues/edit/SubIssues.svelte b/plugins/tracker-resources/src/components/issues/edit/SubIssues.svelte
index 3e45e31f8a..b693922e4d 100644
--- a/plugins/tracker-resources/src/components/issues/edit/SubIssues.svelte
+++ b/plugins/tracker-resources/src/components/issues/edit/SubIssues.svelte
@@ -49,7 +49,12 @@
 
   $: hasSubIssues = issue.subIssues > 0
   $: subIssuesQuery.query(tracker.class.Issue, { attachedTo: issue._id }, async (result) => (subIssues = result), {
-    sort: { rank: SortingOrder.Ascending }
+    sort: { rank: SortingOrder.Ascending },
+    lookup: {
+      _id: {
+        subIssues: tracker.class.Issue
+      }
+    }
   })
 </script>