diff --git a/web-console/src/console-application.tsx b/web-console/src/console-application.tsx
index 1af1795b5e75..822429582c90 100644
--- a/web-console/src/console-application.tsx
+++ b/web-console/src/console-application.tsx
@@ -408,7 +408,7 @@ export class ConsoleApplication extends React.PureComponent<
         goToDatasource={this.goToDatasources}
         goToQuery={this.goToQuery}
         goToStreamingDataLoader={this.goToStreamingDataLoader}
-        goToTasks={this.goToTasksWithDatasource}
+        goToTasks={this.goToTasksWithTaskGroupId}
         capabilities={capabilities}
       />,
     );
diff --git a/web-console/src/views/supervisors-view/supervisors-view.tsx b/web-console/src/views/supervisors-view/supervisors-view.tsx
index b4656d33471d..4c28493f360b 100644
--- a/web-console/src/views/supervisors-view/supervisors-view.tsx
+++ b/web-console/src/views/supervisors-view/supervisors-view.tsx
@@ -782,7 +782,10 @@ export class SupervisorsView extends React.PureComponent<
     switch (supervisor.type) {
       case 'kafka':
       case 'kinesis':
-        goToTasks(supervisor.supervisor_id, `index_${supervisor.type}`);
+        goToTasks(
+          `index_${supervisor.type}_${supervisor.supervisor_id}`,
+          `index_${supervisor.type}`,
+        );
         return;
 
       case 'autocompact':