diff --git a/plugins/tracker-resources/src/components/issues/edit/EditIssue.svelte b/plugins/tracker-resources/src/components/issues/edit/EditIssue.svelte
index 12b8e8ff0f..8413594d7c 100644
--- a/plugins/tracker-resources/src/components/issues/edit/EditIssue.svelte
+++ b/plugins/tracker-resources/src/components/issues/edit/EditIssue.svelte
@@ -108,6 +108,7 @@
   $: issueId = currentTeam && issue && getIssueId(currentTeam, issue)
   $: canSave = title.trim().length > 0
   $: isDescriptionEmpty = !new DOMParser().parseFromString(description, 'text/html').documentElement.innerText?.trim()
+  $: parentIssue = issue?.$lookup?.attachedTo
 
   function edit (ev: MouseEvent) {
     ev.preventDefault()
@@ -180,9 +181,8 @@
     bind:innerWidth
     on:close={() => dispatch('close')}
   >
-    {@const { attachedTo: parentIssue } = issue?.$lookup ?? {}}
     <svelte:fragment slot="navigator">
-      <UpDownNavigator element={issue} />
+      <UpDownNavigator element={issue} showBackButton={!!parentIssue} />
     </svelte:fragment>
     <svelte:fragment slot="header">
       <span class="fs-title">
diff --git a/plugins/view-resources/src/components/UpDownNavigator.svelte b/plugins/view-resources/src/components/UpDownNavigator.svelte
index df099223ec..1354f94df6 100644
--- a/plugins/view-resources/src/components/UpDownNavigator.svelte
+++ b/plugins/view-resources/src/components/UpDownNavigator.svelte
@@ -1,11 +1,21 @@
 <script lang="ts">
   import { Doc } from '@hcengineering/core'
-  import { Button, IconDownOutline, IconUpOutline, panelstore, showPanel } from '@hcengineering/ui'
+  import {
+    Button,
+    IconNavPrev,
+    IconDownOutline,
+    IconUpOutline,
+    panelstore,
+    showPanel,
+    closeTooltip
+  } from '@hcengineering/ui'
   import { tick } from 'svelte'
   import { select } from '../actionImpl'
   import { focusStore } from '../selection'
+  import tracker from '../../../tracker-resources/src/plugin'
 
   export let element: Doc
+  export let showBackButton: boolean = false
 
   async function next (evt: Event, pn: boolean): Promise<void> {
     select(evt, pn ? 1 : -1, element, 'vertical')
@@ -21,8 +31,25 @@
     }
   }
 
+  function goBack () {
+    if (showBackButton) {
+      closeTooltip()
+      history.back()
+    }
+  }
+
   $: select(undefined, 0, element, 'vertical')
 </script>
 
 <Button icon={IconDownOutline} kind={'secondary'} size={'medium'} on:click={(evt) => next(evt, true)} />
 <Button icon={IconUpOutline} kind={'secondary'} size={'medium'} on:click={(evt) => next(evt, false)} />
+
+{#if showBackButton}
+  <Button
+    showTooltip={{ label: tracker.string.Back, direction: 'bottom' }}
+    icon={IconNavPrev}
+    kind={'secondary'}
+    size={'medium'}
+    on:click={goBack}
+  />
+{/if}