diff --git a/apps/frontend/app/components/repository/Assets/Discovery/SearchBar.vue b/apps/frontend/app/components/repository/Assets/Discovery/SearchBar.vue
index 337c9484e..b1f74501b 100644
--- a/apps/frontend/app/components/repository/Assets/Discovery/SearchBar.vue
+++ b/apps/frontend/app/components/repository/Assets/Discovery/SearchBar.vue
@@ -15,6 +15,7 @@
       hide-details
       @click:clear="query = ''"
       @keyup.enter="emit('search')"
+      @update:model-value="emit('search:input')"
     />
     <VBtn
       :loading="isSearching"
@@ -50,7 +51,10 @@ defineProps<{
   isSearching: boolean;
 }>();
 
-const emit = defineEmits<{ search: [] }>();
+const emit = defineEmits<{
+  'search': [];
+  'search:input': [];
+}>();
 
 const query = defineModel<string>('query', { required: true });
 const contentFilter = defineModel<ContentFilter>('contentFilter', { required: true });
diff --git a/apps/frontend/app/components/repository/Assets/Discovery/SearchResults/index.vue b/apps/frontend/app/components/repository/Assets/Discovery/SearchResults/index.vue
index b626ce123..5cb81ab66 100644
--- a/apps/frontend/app/components/repository/Assets/Discovery/SearchResults/index.vue
+++ b/apps/frontend/app/components/repository/Assets/Discovery/SearchResults/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-if="isSearching" class="d-flex justify-center pa-12">
+  <div v-if="isSearching" class="d-flex flex-column align-center pa-12 ga-4">
     <span class="text-body-1 text-primary-lighten-3">
       Searching the web for relevant resources...
     </span>
@@ -13,27 +13,30 @@
         variant="tonal"
       >
         {{ suggestions.length }} results
+        <template v-if="selectedUrls.size">
+          <VIcon size="x-small">mdi-circle-small</VIcon>
+          {{ selectedUrls.size }} selected
+        </template>
       </VChip>
       <VSpacer />
       <VBtn
-        v-if="selectedUrls.size"
         color="primary-lighten-3"
-        prepend-icon="mdi-close-circle-outline"
+        prepend-icon="mdi-checkbox-multiple-outline"
         size="small"
         variant="text"
-        @click="emit('toggle-all', false)"
+        @click="emit('select:all')"
       >
-        Deselect all
+        Select all
       </VBtn>
       <VBtn
-        v-else
+        v-if="selectedUrls.size"
         color="primary-lighten-3"
-        prepend-icon="mdi-checkbox-multiple-outline"
+        prepend-icon="mdi-close-circle-outline"
         size="small"
         variant="text"
-        @click="emit('toggle-all', true)"
+        @click="emit('select:clear')"
       >
-        Select all
+        Clear
       </VBtn>
     </div>
     <div class="d-flex flex-column ga-2">
@@ -42,7 +45,7 @@
         :key="it.url"
         :is-selected="selectedUrls.has(it.url)"
         :suggestion="it"
-        @toggle="emit('toggle', it.url)"
+        @toggle="emit('result:toggle', it.url)"
       />
     </div>
     <div v-if="totalPages > 1" class="d-flex justify-center mt-4">
@@ -85,8 +88,10 @@ const props = defineProps<{
 const page = defineModel<number>('page', { required: true });
 
 const emit = defineEmits<{
-  'toggle': [url: string];
-  'toggle-all': [selected: boolean];
+  'result:toggle': [url: string];
+  'select:all': [];
+  'select:clear': [];
+  'search:cancel': [];
 }>();
 
 const totalPages = computed(() =>
diff --git a/apps/frontend/app/components/repository/Assets/Discovery/TopicPicker/TopicList.vue b/apps/frontend/app/components/repository/Assets/Discovery/TopicPicker/TopicList.vue
new file mode 100644
index 000000000..d73bd8028
--- /dev/null
+++ b/apps/frontend/app/components/repository/Assets/Discovery/TopicPicker/TopicList.vue
@@ -0,0 +1,54 @@
+<template>
+  <VList class="topic-list pa-2" density="compact">
+    <template v-for="item in items" :key="item.id">
+      <VListSubheader
+        v-if="item.isGroup"
+        class="text-uppercase font-weight-bold"
+      >
+        {{ item.name }}
+      </VListSubheader>
+      <VListItem
+        v-else
+        :prepend-icon="item.isLeaf
+          ? 'mdi-file-document-outline'
+          : 'mdi-folder-outline'"
+        :value="item.id"
+        class="topic-list-item"
+        @click="emit('topic:select', item)"
+      >
+        <VListItemTitle class="text-body-2">
+          {{ item.name }}
+        </VListItemTitle>
+        <VListItemSubtitle v-if="item.parentName" class="text-caption">
+          {{ item.parentName }}
+        </VListItemSubtitle>
+      </VListItem>
+    </template>
+  </VList>
+</template>
+
+<script lang="ts" setup>
+import type { TopicItem } from './types';
+
+defineProps<{
+  items: TopicItem[];
+}>();
+
+const emit = defineEmits<{
+  'topic:select': [topic: TopicItem];
+}>();
+</script>
+
+<style lang="scss" scoped>
+.topic-list {
+  overflow-y: auto;
+}
+
+.topic-list-item {
+  cursor: pointer;
+
+  &:hover {
+    background: rgba(0, 0, 0, 0.04);
+  }
+}
+</style>
diff --git a/apps/frontend/app/components/repository/Assets/Discovery/TopicPicker/index.vue b/apps/frontend/app/components/repository/Assets/Discovery/TopicPicker/index.vue
new file mode 100644
index 000000000..1562e5bc9
--- /dev/null
+++ b/apps/frontend/app/components/repository/Assets/Discovery/TopicPicker/index.vue
@@ -0,0 +1,68 @@
+<template>
+  <VAutocomplete
+    :items="items"
+    :model-value="modelValue?.id ?? null"
+    color="primary-lighten-3"
+    density="default"
+    item-title="name"
+    item-value="id"
+    label="Outline topic"
+    min-width="550"
+    max-width="550"
+    placeholder="Browse topics..."
+    prepend-inner-icon="mdi-file-tree-outline"
+    variant="outlined"
+    clearable
+    hide-details
+    @update:model-value="onSelect"
+  >
+    <template #item="{ item, props: itemProps }">
+      <VListItem v-bind="itemProps" color="primary-darken-4">
+        <template #prepend>
+          <VIcon
+            :icon="item.raw.isLeaf
+              ? 'mdi-file-document-outline'
+              : 'mdi-folder-outline'"
+            size="small"
+          />
+        </template>
+        <VListItemSubtitle v-if="item.raw.breadcrumb" class="text-caption">
+          {{ item.raw.breadcrumb }}
+        </VListItemSubtitle>
+      </VListItem>
+    </template>
+    <template v-if="modelValue?.breadcrumb" #selection>
+      <div>
+        <div class="text-body-2">{{ modelValue.name }}</div>
+        <div class="text-caption text-primary-lighten-3">
+          {{ modelValue.breadcrumb }}
+        </div>
+      </div>
+    </template>
+  </VAutocomplete>
+</template>
+
+<script lang="ts" setup>
+import type { TopicItem } from './types';
+import { useOutlineTree } from './useOutlineTree';
+
+defineProps<{
+  modelValue: TopicItem | null;
+}>();
+
+const emit = defineEmits<{
+  'update:modelValue': [topic: TopicItem | null];
+  'topic:clear': [];
+}>();
+
+const { items } = useOutlineTree();
+
+function onSelect(id: number | null) {
+  if (!id) {
+    emit('topic:clear');
+    return;
+  }
+  const topic = items.value.find((it) => it.id === id);
+  if (topic) emit('update:modelValue', topic);
+}
+</script>
diff --git a/apps/frontend/app/components/repository/Assets/Discovery/TopicPicker/types.ts b/apps/frontend/app/components/repository/Assets/Discovery/TopicPicker/types.ts
new file mode 100644
index 000000000..ec1615293
--- /dev/null
+++ b/apps/frontend/app/components/repository/Assets/Discovery/TopicPicker/types.ts
@@ -0,0 +1,12 @@
+export interface TopicItem {
+  id: number;
+  name: string;
+  parentName?: string;
+  // Full ancestor breadcrumb (e.g. "Module 1 / Sub-module")
+  breadcrumb: string;
+  isGroup: boolean;
+  isLeaf: boolean;
+  depth: number;
+  // Full context path for building search queries.
+  context: string[];
+}
diff --git a/apps/frontend/app/components/repository/Assets/Discovery/TopicPicker/useOutlineTree.ts b/apps/frontend/app/components/repository/Assets/Discovery/TopicPicker/useOutlineTree.ts
new file mode 100644
index 000000000..0d27b7384
--- /dev/null
+++ b/apps/frontend/app/components/repository/Assets/Discovery/TopicPicker/useOutlineTree.ts
@@ -0,0 +1,61 @@
+import { activity as activityUtils } from '@tailor-cms/utils';
+import { schema as schemaConfig } from '@tailor-cms/config';
+
+import { useCurrentRepository } from '@/stores/current-repository';
+import type { TopicItem } from './types';
+
+const buildTopicMeta = (
+  activity: any,
+  activityCollection: any[],
+  repositoryName: string,
+): TopicItem => {
+  const name = activity.data?.name || '';
+  const isLeaf = schemaConfig.isEditable(activity.type);
+  const ancestors = activityUtils.getAncestors(activityCollection, activity);
+  const ancestorNames = ancestors.map((a: any) => a.data?.name).filter(Boolean);
+  return {
+    id: activity.id,
+    name,
+    isGroup: !isLeaf,
+    parentName: ancestorNames.at(-1),
+    breadcrumb: ancestorNames.toReversed().join(' / '),
+    isLeaf,
+    depth: ancestors.length,
+    context: [name, ...ancestorNames, repositoryName].filter(Boolean),
+  };
+};
+
+function flattenTree(nodes: any[]): TopicItem[] {
+  const result: TopicItem[] = [];
+  for (const node of nodes) {
+    if (node.topicMeta) result.push(node.topicMeta);
+    if (node.children?.length) {
+      result.push(...flattenTree(node.children));
+    }
+  }
+  return result;
+}
+
+/**
+ * Derives a flat topic list from the repository outline.
+ * Uses shared toTreeFormat for hierarchy, schemaConfig.isEditable
+ * for leaf detection, and getAncestors for parent context.
+ */
+export function useOutlineTree() {
+  const store = useCurrentRepository();
+  const hasOutline = computed(() => store.outlineActivities.length > 0);
+
+  const items = computed<TopicItem[]>(() => {
+    const activities = store.outlineActivities as any[];
+    if (!activities.length) return [];
+    const repo = store.repository;
+    const tree = activityUtils.toTreeFormat(activities, {
+      processNodeFn: (activity: any) => ({
+        topicMeta: buildTopicMeta(activity, activities, repo?.name || ''),
+      }),
+    });
+    return flattenTree(tree);
+  });
+
+  return { hasOutline, items };
+}
diff --git a/apps/frontend/app/components/repository/Assets/Discovery/index.vue b/apps/frontend/app/components/repository/Assets/Discovery/index.vue
index 57dc31fdd..6ddf13cf2 100644
--- a/apps/frontend/app/components/repository/Assets/Discovery/index.vue
+++ b/apps/frontend/app/components/repository/Assets/Discovery/index.vue
@@ -5,7 +5,7 @@
         <VToolbarTitle class="text-primary-lighten-4 ml-4">
           <VIcon
             class="mx-2"
-            color="teal-lighten-4"
+            color="primary-lighten-4"
             icon="mdi-earth-plus"
             size="small"
           />
@@ -24,11 +24,18 @@
       <VContainer class="discovery-content pt-6" fluid>
         <VRow justify="center">
           <VCol cols="12" lg="10" xl="8">
+            <TopicPicker
+              v-if="hasOutline"
+              v-model="selectedTopic"
+              class="mb-4"
+              @topic:clear="clearTopic"
+            />
             <SearchBar
               v-model:query="query"
               v-model:content-filter="contentFilter"
               :is-searching="isSearching"
               @search="search"
+              @search:input="selectedTopic = null"
             />
             <VAlert
               class="mb-4"
@@ -49,8 +56,10 @@
               :selected-urls="selectedUrls"
               :is-searching="isSearching"
               :has-searched="hasSearched"
-              @toggle="toggleSuggestion"
-              @toggle-all="$event ? selectAll() : selectedUrls.clear()"
+              @result:toggle="toggleSuggestion"
+              @select:all="selectAll"
+              @select:clear="selectedUrls.clear()"
+              @search:cancel="isSearching = false"
             />
           </VCol>
         </VRow>
@@ -67,27 +76,36 @@ import {
 } from '@tailor-cms/interfaces/discovery';
 
 import api from '@/api/repositoryAsset';
+import { useCurrentRepository } from '@/stores/current-repository';
 import DiscoveryActions from './DiscoveryActions.vue';
 import SearchBar from './SearchBar.vue';
 import SearchResults from './SearchResults/index.vue';
-import { useCurrentRepository } from '@/stores/current-repository';
+import TopicPicker from './TopicPicker/index.vue';
+import type { TopicItem } from './TopicPicker/types';
+import { useOutlineTree } from './TopicPicker/useOutlineTree';
 
+const FETCH_COUNT = 100;
+const MAX_QUERY_WORDS = 15;
 const DOWNLOADABLE_TYPES = new Set([
   ContentType.Image,
   ContentType.Pdf,
   ContentType.Video,
 ]);
-const FETCH_COUNT = 100;
 
 const show = defineModel<boolean>({ default: false });
 const emit = defineEmits(['added']);
 
 const notify = useNotification();
-const currentRepositoryStore = useCurrentRepository();
-const repositoryId = computed(() => currentRepositoryStore.repository?.id);
+const store = useCurrentRepository();
+const repositoryId = computed(
+  () => store.repository?.id,
+);
 
 const query = ref('');
 const contentFilter = ref<ContentFilter>(ContentFilter.All);
+const selectedTopic = ref<TopicItem | null>(null);
+
+const { hasOutline } = useOutlineTree();
 
 const isAdding = ref(false);
 const isSearching = ref(false);
@@ -96,7 +114,6 @@ const hasSearched = ref(false);
 const suggestions = ref<DiscoveryResult[]>([]);
 const selectedUrls = reactive(new Set<string>());
 const page = ref(1);
-
 const hasDownloadable = computed(() => {
   if (!selectedUrls.size) return false;
   return suggestions.value
@@ -126,6 +143,13 @@ async function search() {
   }
 }
 
+function clearTopic() {
+  selectedTopic.value = null;
+  query.value = '';
+  suggestions.value = [];
+  hasSearched.value = false;
+}
+
 function toggleSuggestion(url: string) {
   if (selectedUrls.has(url)) selectedUrls.delete(url);
   else selectedUrls.add(url);
@@ -137,6 +161,11 @@ function selectAll() {
 
 function toImportMeta(result?: DiscoveryResult) {
   if (!result) return {};
+  const tags = [...(result.tags || [])];
+  if (selectedTopic.value) {
+    const topicName = selectedTopic.value.name;
+    if (!tags.includes(topicName)) tags.push(topicName);
+  }
   return {
     contentType: result.type,
     title: result.title,
@@ -144,7 +173,7 @@ function toImportMeta(result?: DiscoveryResult) {
     downloadUrl: result.downloadUrl,
     author: result.author,
     license: result.license,
-    tags: result.tags,
+    tags,
     altText: result.altText,
   };
 }
@@ -187,6 +216,17 @@ watch(show, (v) => {
   selectedUrls.clear();
   hasSearched.value = false;
   page.value = 1;
+  selectedTopic.value = null;
+});
+
+watch(selectedTopic, (topic) => {
+  if (!topic) return;
+  query.value = topic.context
+    .join(' ')
+    .split(/\s+/)
+    .slice(0, MAX_QUERY_WORDS)
+    .join(' ');
+  search();
 });
 
 watch(contentFilter, () => {