diff --git a/plugins/tracker-resources/src/components/sprints/EditSprint.svelte b/plugins/tracker-resources/src/components/sprints/EditSprint.svelte
index 415a76bd2d..15572ccc15 100644
--- a/plugins/tracker-resources/src/components/sprints/EditSprint.svelte
+++ b/plugins/tracker-resources/src/components/sprints/EditSprint.svelte
@@ -4,6 +4,7 @@
   import { Sprint } from '@hcengineering/tracker'
   import { Button, DatePresenter, EditBox, Icon, IconMoreH, Label, showPopup } from '@hcengineering/ui'
   import { ContextMenu, DocAttributeBar } from '@hcengineering/view-resources'
+  import { createEventDispatcher } from 'svelte'
   import { onDestroy } from 'svelte'
   import { activeSprint } from '../../issues'
   import tracker from '../../plugin'
@@ -15,6 +16,7 @@
   export let sprint: Sprint
 
   const client = getClient()
+  const dispatch = createEventDispatcher()
 
   async function change (field: string, value: any) {
     await client.update(sprint, { [field]: value })
@@ -24,6 +26,7 @@
     showPopup(SprintPopup, { _class: tracker.class.Sprint }, container, (value) => {
       if (value != null) {
         sprint = value
+        dispatch('sprint', sprint._id)
       }
     })
   }
diff --git a/plugins/tracker-resources/src/components/sprints/Sprints.svelte b/plugins/tracker-resources/src/components/sprints/Sprints.svelte
index acbc899563..7ecece4579 100644
--- a/plugins/tracker-resources/src/components/sprints/Sprints.svelte
+++ b/plugins/tracker-resources/src/components/sprints/Sprints.svelte
@@ -17,7 +17,7 @@
   import { IntlString } from '@hcengineering/platform'
   import { createQuery } from '@hcengineering/presentation'
   import { Sprint, Team } from '@hcengineering/tracker'
-  import { closePopup, closeTooltip, location } from '@hcengineering/ui'
+  import { closePopup, closeTooltip, getCurrentLocation, location, navigate } from '@hcengineering/ui'
   import { onDestroy } from 'svelte'
   import tracker from '../../plugin'
   import { SprintViewMode } from '../../utils'
@@ -53,7 +53,14 @@
 </script>
 
 {#if sprint}
-  <EditSprint {sprint} />
+  <EditSprint
+    {sprint}
+    on:sprint={(evt) => {
+      const loc = getCurrentLocation()
+      loc.path[5] = evt.detail
+      navigate(loc)
+    }}
+  />
 {:else}
   <SprintBrowser {label} query={{ space: currentSpace }} {search} {mode} />
 {/if}