diff --git a/plugins/tracker-resources/src/components/CreateIssue.svelte b/plugins/tracker-resources/src/components/CreateIssue.svelte
index 50bec76943..d39d6b2164 100644
--- a/plugins/tracker-resources/src/components/CreateIssue.svelte
+++ b/plugins/tracker-resources/src/components/CreateIssue.svelte
@@ -741,7 +741,13 @@
       }}
     />
   {/key}
-  <IssueTemplateChilds bind:children={subIssues} sprint={object.sprint} project={object.project} isScrollable />
+  <IssueTemplateChilds
+    bind:children={subIssues}
+    sprint={object.sprint}
+    project={object.project}
+    isScrollable
+    maxHeight="limited"
+  />
   <svelte:fragment slot="pool">
     {#if issueStatuses}
       <div id="status-editor">
diff --git a/plugins/tracker-resources/src/components/templates/CreateIssueTemplate.svelte b/plugins/tracker-resources/src/components/templates/CreateIssueTemplate.svelte
index c767a5249f..84c55ec96b 100644
--- a/plugins/tracker-resources/src/components/templates/CreateIssueTemplate.svelte
+++ b/plugins/tracker-resources/src/components/templates/CreateIssueTemplate.svelte
@@ -166,6 +166,7 @@
     project={object.project}
     sprint={object.sprint}
     teamId={spaceRef?.identifier ?? 'TSK'}
+    maxHeight="limited"
   />
   <svelte:fragment slot="pool">
     <PriorityEditor
diff --git a/plugins/tracker-resources/src/components/templates/EditIssueTemplate.svelte b/plugins/tracker-resources/src/components/templates/EditIssueTemplate.svelte
index d62db4da04..97c9b5c083 100644
--- a/plugins/tracker-resources/src/components/templates/EditIssueTemplate.svelte
+++ b/plugins/tracker-resources/src/components/templates/EditIssueTemplate.svelte
@@ -254,6 +254,7 @@
         {#key template._id && currentTeam !== undefined}
           {#if currentTeam !== undefined}
             <SubIssueTemplates
+              maxHeight="limited"
               bind:children={template.children}
               on:create-issue={createIssue}
               on:update-issue={updateIssue}
diff --git a/plugins/tracker-resources/src/components/templates/IssueTemplateChilds.svelte b/plugins/tracker-resources/src/components/templates/IssueTemplateChilds.svelte
index a1c631a270..4c4ea5a7bd 100644
--- a/plugins/tracker-resources/src/components/templates/IssueTemplateChilds.svelte
+++ b/plugins/tracker-resources/src/components/templates/IssueTemplateChilds.svelte
@@ -15,7 +15,7 @@
 <script lang="ts">
   import { Ref } from '@hcengineering/core'
   import { IssueTemplateChild, Project, Sprint } from '@hcengineering/tracker'
-  import { Button, closeTooltip, ExpandCollapse, IconAdd } from '@hcengineering/ui'
+  import { Button, closeTooltip, ExpandCollapse, IconAdd, Scroller } from '@hcengineering/ui'
   import { afterUpdate } from 'svelte'
   import { createEventDispatcher } from 'svelte'
   import tracker from '../../plugin'
@@ -86,15 +86,17 @@
 </div>
 {#if hasSubIssues}
   <ExpandCollapse isExpanded={!isCollapsed} duration={400} on:changeContent>
-    <div class="flex-col flex-no-shrink list clear-mins" class:collapsed={isCollapsed}>
-      <IssueTemplateChildList
-        {project}
-        {sprint}
-        bind:issues={children}
-        {teamId}
-        on:move={handleIssueSwap}
-        on:update-issue
-      />
+    <div class="flex-col flex-no-shrink max-h-30 list clear-mins" class:collapsed={isCollapsed}>
+      <Scroller>
+        <IssueTemplateChildList
+          {project}
+          {sprint}
+          bind:issues={children}
+          {teamId}
+          on:move={handleIssueSwap}
+          on:update-issue
+        />
+      </Scroller>
     </div>
   </ExpandCollapse>
 {/if}