diff --git a/plugins/tracker-resources/src/components/issues/edit/ControlPanel.svelte b/plugins/tracker-resources/src/components/issues/edit/ControlPanel.svelte
index 15a8377a2a..cea7d2f769 100644
--- a/plugins/tracker-resources/src/components/issues/edit/ControlPanel.svelte
+++ b/plugins/tracker-resources/src/components/issues/edit/ControlPanel.svelte
@@ -174,12 +174,10 @@
   </span>
   <ComponentEditor value={issue} />
 
-  {#if issue.sprint}
-    <span class="label">
-      <Label label={tracker.string.Sprint} />
-    </span>
-    <SprintEditor value={issue} />
-  {/if}
+  <span class="label">
+    <Label label={tracker.string.Sprint} />
+  </span>
+  <SprintEditor value={issue} />
 
   {#if issue.dueDate !== null}
     <div class="divider" />
diff --git a/plugins/tracker-resources/src/components/sprints/SprintEditor.svelte b/plugins/tracker-resources/src/components/sprints/SprintEditor.svelte
index ff633a1f64..ab5478e631 100644
--- a/plugins/tracker-resources/src/components/sprints/SprintEditor.svelte
+++ b/plugins/tracker-resources/src/components/sprints/SprintEditor.svelte
@@ -67,8 +67,8 @@
   $: twoRows = $deviceInfo.twoRows
 </script>
 
-{#if value.sprint || sprint}
-  {#if kind === 'list'}
+{#if kind === 'list'}
+  {#if value.sprint}
     <div class="clear-mins" class:label-wrapper={compression}>
       <SprintSelector
         {kind}
@@ -87,57 +87,57 @@
         onChange={handleSprintIdChanged}
       />
     </div>
-  {:else}
-    <div
-      class="flex flex-wrap clear-mins"
-      class:minus-margin={kind === 'list-header'}
-      class:label-wrapper={compression}
-      style:flex-direction={twoRows ? 'column' : 'row'}
-    >
-      {#if (value.sprint && value.sprint !== $activeSprint && groupBy !== 'sprint') || shouldShowPlaceholder}
-        <div class="flex-row-center" class:minus-margin-vSpace={kind === 'list-header'} class:compression style:width>
-          <SprintSelector
-            {kind}
-            {size}
-            {shape}
-            {width}
-            {justify}
-            {isEditable}
-            {shouldShowLabel}
-            {popupPlaceholder}
-            {onlyIcon}
-            {enlargedText}
-            showTooltip={{ label: value.sprint ? tracker.string.MoveToSprint : tracker.string.AddToSprint }}
-            value={value.sprint}
-            onChange={handleSprintIdChanged}
-          />
-        </div>
-      {/if}
-
-      {#if sprint && kind === 'list-header'}
-        <div class="flex-row-center" class:minus-margin-space={kind === 'list-header'} class:text-sm={twoRows}>
-          {#if sprint}
-            {@const now = Date.now()}
-            {@const sprintDaysFrom =
-              now < sprint.startDate
-                ? 0
-                : now > sprint.targetDate
-                ? getDayOfSprint(sprint.startDate, sprint.targetDate)
-                : getDayOfSprint(sprint.startDate, now)}
-            {@const sprintDaysTo = getDayOfSprint(sprint.startDate, sprint.targetDate)}
-            <DatePresenter value={sprint.startDate} kind={'transparent'} />
-            <span class="p-1"> / </span>
-            <DatePresenter value={sprint.targetDate} kind={'transparent'} />
-            <div class="w-2 min-w-2" />
-            <!-- Active sprint in time -->
-            <TimePresenter value={sprintDaysFrom} />
-            /
-            <TimePresenter value={sprintDaysTo} />
-          {/if}
-        </div>
-      {/if}
-    </div>
   {/if}
+{:else}
+  <div
+    class="flex flex-wrap clear-mins"
+    class:minus-margin={kind === 'list-header'}
+    class:label-wrapper={compression}
+    style:flex-direction={twoRows ? 'column' : 'row'}
+  >
+    {#if (value.sprint && value.sprint !== $activeSprint && groupBy !== 'sprint') || shouldShowPlaceholder}
+      <div class="flex-row-center" class:minus-margin-vSpace={kind === 'list-header'} class:compression style:width>
+        <SprintSelector
+          {kind}
+          {size}
+          {shape}
+          {width}
+          {justify}
+          {isEditable}
+          {shouldShowLabel}
+          {popupPlaceholder}
+          {onlyIcon}
+          {enlargedText}
+          showTooltip={{ label: value.sprint ? tracker.string.MoveToSprint : tracker.string.AddToSprint }}
+          value={value.sprint}
+          onChange={handleSprintIdChanged}
+        />
+      </div>
+    {/if}
+
+    {#if sprint && kind === 'list-header'}
+      <div class="flex-row-center" class:minus-margin-space={kind === 'list-header'} class:text-sm={twoRows}>
+        {#if sprint}
+          {@const now = Date.now()}
+          {@const sprintDaysFrom =
+            now < sprint.startDate
+              ? 0
+              : now > sprint.targetDate
+              ? getDayOfSprint(sprint.startDate, sprint.targetDate)
+              : getDayOfSprint(sprint.startDate, now)}
+          {@const sprintDaysTo = getDayOfSprint(sprint.startDate, sprint.targetDate)}
+          <DatePresenter value={sprint.startDate} kind={'transparent'} />
+          <span class="p-1"> / </span>
+          <DatePresenter value={sprint.targetDate} kind={'transparent'} />
+          <div class="w-2 min-w-2" />
+          <!-- Active sprint in time -->
+          <TimePresenter value={sprintDaysFrom} />
+          /
+          <TimePresenter value={sprintDaysTo} />
+        {/if}
+      </div>
+    {/if}
+  </div>
 {/if}
 
 <style lang="scss">
diff --git a/plugins/tracker-resources/src/components/sprints/SprintPresenter.svelte b/plugins/tracker-resources/src/components/sprints/SprintPresenter.svelte
index 2f474aba29..0734ee54bf 100644
--- a/plugins/tracker-resources/src/components/sprints/SprintPresenter.svelte
+++ b/plugins/tracker-resources/src/components/sprints/SprintPresenter.svelte
@@ -36,6 +36,7 @@
     loc.path[4] = 'sprints'
     loc.path[5] = value._id
     loc.path.length = 6
+    loc.fragment = undefined
     navigate(loc)
   }
 </script>