diff --git a/airflow/www/static/js/grid/ResetRoot.jsx b/airflow/www/static/js/grid/ResetRoot.jsx
index c69e8dbb84cf7..bd6a89e3b7d20 100644
--- a/airflow/www/static/js/grid/ResetRoot.jsx
+++ b/airflow/www/static/js/grid/ResetRoot.jsx
@@ -33,7 +33,7 @@ const ResetRoot = () => (
         variant="outline"
         href={url}
         colorScheme="blue"
-        mr={2}
+        mx={2}
         title="Reset root to show the whole DAG"
       >
         Reset Root
diff --git a/airflow/www/static/js/grid/details/content/taskInstance/Nav.jsx b/airflow/www/static/js/grid/details/content/taskInstance/Nav.jsx
index 93ee175b69da3..08c33d1e65756 100644
--- a/airflow/www/static/js/grid/details/content/taskInstance/Nav.jsx
+++ b/airflow/www/static/js/grid/details/content/taskInstance/Nav.jsx
@@ -47,7 +47,7 @@ const LinkButton = ({ children, ...rest }) => (
 );
 
 const Nav = ({
-  taskId, executionDate, operator, isMapped,
+  runId, taskId, executionDate, operator, isMapped,
 }) => {
   const params = new URLSearchParams({
     task_id: taskId,
@@ -68,6 +68,8 @@ const Nav = ({
   }).toString();
 
   const filterParams = new URLSearchParams({
+    task_id: taskId,
+    dag_run_id: runId,
     base_date: baseDate,
     num_runs: numRuns,
     root: taskId,
diff --git a/airflow/www/static/js/grid/details/content/taskInstance/index.jsx b/airflow/www/static/js/grid/details/content/taskInstance/index.jsx
index b6aad7d4d3ddc..90ef2e839e2ef 100644
--- a/airflow/www/static/js/grid/details/content/taskInstance/index.jsx
+++ b/airflow/www/static/js/grid/details/content/taskInstance/index.jsx
@@ -83,6 +83,7 @@ const TaskInstance = ({ taskId, runId }) => {
       {!isGroup && (
         <TaskNav
           taskId={taskId}
+          runId={runId}
           isMapped={isMapped}
           executionDate={executionDate}
           operator={operator}