diff --git a/front/components/data_source_view/DataSourceViewSelector.tsx b/front/components/data_source_view/DataSourceViewSelector.tsx
index d19c7c5d2768..dc4deee3a4a9 100644
--- a/front/components/data_source_view/DataSourceViewSelector.tsx
+++ b/front/components/data_source_view/DataSourceViewSelector.tsx
@@ -157,6 +157,10 @@ export function DataSourceViewsSelector({
   const folders = filteredDSVs.filter((dsv) => isFolder(dsv.dataSource));
   const websites = filteredDSVs.filter((dsv) => isWebsite(dsv.dataSource));
 
+  const displayManagedDsv =
+    managedDsv.length > 0 &&
+    (useCase === "assistantBuilder" || useCase === "trackerBuilder");
+
   const defaultSpace = useMemo(() => {
     const firstKey = Object.keys(selectionConfigurations)[0] ?? null;
     return firstKey
@@ -206,7 +210,7 @@ export function DataSourceViewsSelector({
   } else {
     return (
       <Tree isLoading={false}>
-        {managedDsv.length > 0 && useCase === "assistantBuilder" && (
+        {displayManagedDsv && (
           <Tree.Item
             key="connected"
             label="Connected Data"
diff --git a/front/components/trackers/TrackerBuilder.tsx b/front/components/trackers/TrackerBuilder.tsx
index 2c01dbdf0508..f3e64ba597a7 100644
--- a/front/components/trackers/TrackerBuilder.tsx
+++ b/front/components/trackers/TrackerBuilder.tsx
@@ -33,6 +33,7 @@ import {
   AppLayoutSimpleSaveCancelTitle,
 } from "@app/components/sparkle/AppLayoutTitle";
 import TrackerBuilderDataSourceModal from "@app/components/trackers/TrackerBuilderDataSourceModal";
+import { TrackerDataSourceSelectedTree } from "@app/components/trackers/TrackerDataSourceSelectedTree";
 import { isEmailValid } from "@app/lib/utils";
 
 export const TrackerBuilder = ({
@@ -182,6 +183,7 @@ export const TrackerBuilder = ({
     // Handle errors.
     if (!res.ok) {
       const resJson = await res.json();
+      setIsSubmitting(false);
       sendNotification({
         title: initialTrackerId
           ? "Failed to update tracker"
@@ -189,10 +191,10 @@ export const TrackerBuilder = ({
         description: resJson.error.message,
         type: "error",
       });
-      setIsSubmitting(false);
       return;
     }
-
+    setIsSubmitting(false);
+    await router.push(`/w/${owner.sId}/assistant/labs/trackers`);
     sendNotification({
       title: initialTrackerId ? "Tracker updated" : "Tracker Created",
       description: initialTrackerId
@@ -200,8 +202,6 @@ export const TrackerBuilder = ({
         : "Tracker created successfully.",
       type: "success",
     });
-    setIsSubmitting(false);
-    await router.push(`/w/${owner.sId}/assistant/labs/trackers`);
   };
 
   return (
@@ -295,7 +295,7 @@ export const TrackerBuilder = ({
           </div>
         </div>
 
-        <div className="flex flex-col gap-6">
+        <div className="flex flex-col gap-8">
           <div>
             <Page.SectionHeader title="Naming" />
             <div className="text-sm font-normal text-element-700">
@@ -339,7 +339,7 @@ export const TrackerBuilder = ({
           </div>
         </div>
 
-        <div className="flex flex-col gap-6">
+        <div className="flex flex-col gap-8">
           <div>
             <Page.SectionHeader title="Notification Settings" />
             <div className="text-sm font-normal text-element-700">
@@ -395,7 +395,7 @@ export const TrackerBuilder = ({
             </div>
           </div>
         </div>
-        <div className="flex flex-col gap-6">
+        <div className="flex flex-col gap-8">
           <div>
             <Page.SectionHeader title="Tracker Settings" />
             <div className="text-sm font-normal text-element-700">
@@ -433,7 +433,21 @@ export const TrackerBuilder = ({
                 />
               </div>
             </div>
-            <div className="flex items-end md:col-span-2" />
+            <div className="flex md:col-span-2">
+              <div className="flex flex-col space-y-2">
+                <Label className="mb-1">Maintained Documents</Label>
+                {Object.keys(tracker.maintainedDataSources).length === 0 ? (
+                  <div className="text-sm font-normal text-element-700">
+                    No documents selected.
+                  </div>
+                ) : (
+                  <TrackerDataSourceSelectedTree
+                    owner={owner}
+                    dataSourceConfigurations={tracker.maintainedDataSources}
+                  />
+                )}
+              </div>
+            </div>
           </div>
 
           <div className="grid grid-cols-1 gap-4 md:grid-cols-3">
@@ -449,7 +463,21 @@ export const TrackerBuilder = ({
                 />
               </div>
             </div>
-            <div className="flex items-end md:col-span-2" />
+            <div className="flex md:col-span-2">
+              <div className="flex flex-col space-y-2">
+                <Label className="mb-1">Watched Documents</Label>
+                {Object.keys(tracker.watchedDataSources).length === 0 ? (
+                  <div className="text-sm font-normal text-element-700">
+                    No documents selected.
+                  </div>
+                ) : (
+                  <TrackerDataSourceSelectedTree
+                    owner={owner}
+                    dataSourceConfigurations={tracker.watchedDataSources}
+                  />
+                )}
+              </div>
+            </div>
           </div>
         </div>
       </div>
diff --git a/front/components/trackers/TrackerDataSourceSelectedTree.tsx b/front/components/trackers/TrackerDataSourceSelectedTree.tsx
new file mode 100644
index 000000000000..f4ebb9d3829a
--- /dev/null
+++ b/front/components/trackers/TrackerDataSourceSelectedTree.tsx
@@ -0,0 +1,149 @@
+import {
+  BracesIcon,
+  classNames,
+  ExternalLinkIcon,
+  FolderIcon,
+  IconButton,
+  Tree,
+} from "@dust-tt/sparkle";
+import type {
+  DataSourceViewSelectionConfigurations,
+  DataSourceViewType,
+  LightWorkspaceType,
+} from "@dust-tt/types";
+import { useState } from "react";
+
+import DataSourceViewDocumentModal from "@app/components/DataSourceViewDocumentModal";
+import { DataSourceViewPermissionTree } from "@app/components/DataSourceViewPermissionTree";
+import { getConnectorProviderLogoWithFallback } from "@app/lib/connector_providers";
+import { orderDatasourceViewSelectionConfigurationByImportance } from "@app/lib/connectors";
+import { getVisualForContentNode } from "@app/lib/content_nodes";
+import {
+  canBeExpanded,
+  getDisplayNameForDataSource,
+} from "@app/lib/data_sources";
+
+export const TrackerDataSourceSelectedTree = ({
+  owner,
+  dataSourceConfigurations,
+}: {
+  owner: LightWorkspaceType;
+  dataSourceConfigurations: DataSourceViewSelectionConfigurations;
+}) => {
+  const [documentToDisplay, setDocumentToDisplay] = useState<string | null>(
+    null
+  );
+  const [dataSourceViewToDisplay, setDataSourceViewToDisplay] =
+    useState<DataSourceViewType | null>(null);
+  return (
+    <>
+      <DataSourceViewDocumentModal
+        owner={owner}
+        dataSourceView={dataSourceViewToDisplay}
+        documentId={documentToDisplay}
+        isOpen={!!documentToDisplay}
+        onClose={() => setDocumentToDisplay(null)}
+      />
+      <Tree>
+        {orderDatasourceViewSelectionConfigurationByImportance(
+          Object.values(dataSourceConfigurations)
+        ).map((dsConfig) => {
+          const LogoComponent = getConnectorProviderLogoWithFallback(
+            dsConfig.dataSourceView.dataSource.connectorProvider,
+            FolderIcon
+          );
+
+          return (
+            <Tree.Item
+              key={dsConfig.dataSourceView.sId}
+              type={
+                canBeExpanded("documents", dsConfig.dataSourceView.dataSource)
+                  ? "node"
+                  : "leaf"
+              } // todo make useConnectorPermissions hook work for non managed ds (Folders)
+              label={getDisplayNameForDataSource(
+                dsConfig.dataSourceView.dataSource
+              )}
+              visual={LogoComponent}
+              className="whitespace-nowrap"
+            >
+              {dsConfig.isSelectAll && (
+                <DataSourceViewPermissionTree
+                  owner={owner}
+                  dataSourceView={dsConfig.dataSourceView}
+                  parentId={null}
+                  onDocumentViewClick={(documentId: string) => {
+                    setDataSourceViewToDisplay(dsConfig.dataSourceView);
+                    setDocumentToDisplay(documentId);
+                  }}
+                  viewType={"documents"}
+                />
+              )}
+              {dsConfig.selectedResources.map((node) => {
+                return (
+                  <Tree.Item
+                    key={`${dsConfig.dataSourceView.sId}-${node.internalId}`}
+                    label={node.titleWithParentsContext ?? node.title}
+                    type={node.expandable ? "node" : "leaf"}
+                    visual={getVisualForContentNode(node)}
+                    className="whitespace-nowrap"
+                    actions={
+                      <div className="mr-8 flex flex-row gap-2">
+                        <IconButton
+                          size="xs"
+                          icon={ExternalLinkIcon}
+                          onClick={() => {
+                            if (node.sourceUrl) {
+                              window.open(node.sourceUrl, "_blank");
+                            }
+                          }}
+                          className={classNames(
+                            node.sourceUrl
+                              ? ""
+                              : "pointer-events-none opacity-0"
+                          )}
+                          disabled={!node.sourceUrl}
+                          variant="outline"
+                        />
+                        <IconButton
+                          size="xs"
+                          icon={BracesIcon}
+                          onClick={() => {
+                            if (node.dustDocumentId) {
+                              setDataSourceViewToDisplay(
+                                dsConfig.dataSourceView
+                              );
+                              setDocumentToDisplay(node.dustDocumentId);
+                            }
+                          }}
+                          className={classNames(
+                            node.dustDocumentId
+                              ? ""
+                              : "pointer-events-none opacity-0"
+                          )}
+                          disabled={!node.dustDocumentId}
+                          variant="ghost"
+                        />
+                      </div>
+                    }
+                  >
+                    <DataSourceViewPermissionTree
+                      owner={owner}
+                      dataSourceView={dsConfig.dataSourceView}
+                      parentId={node.internalId}
+                      onDocumentViewClick={(documentId: string) => {
+                        setDataSourceViewToDisplay(dsConfig.dataSourceView);
+                        setDocumentToDisplay(documentId);
+                      }}
+                      viewType={"documents"}
+                    />
+                  </Tree.Item>
+                );
+              })}
+            </Tree.Item>
+          );
+        })}
+      </Tree>
+    </>
+  );
+};