diff --git a/kolibri/plugins/coach/assets/src/views/lessons/LessonSummaryPage/sidePanels/LessonResourceSelection/subPages/PreviewSelectedResources/PreviewContent.vue b/kolibri/plugins/coach/assets/src/views/lessons/LessonSummaryPage/sidePanels/LessonResourceSelection/subPages/PreviewSelectedResources/PreviewContent.vue
index 1a267df13c4..79beaa5ed4f 100644
--- a/kolibri/plugins/coach/assets/src/views/lessons/LessonSummaryPage/sidePanels/LessonResourceSelection/subPages/PreviewSelectedResources/PreviewContent.vue
+++ b/kolibri/plugins/coach/assets/src/views/lessons/LessonSummaryPage/sidePanels/LessonResourceSelection/subPages/PreviewSelectedResources/PreviewContent.vue
@@ -30,7 +30,8 @@
     </div>
 
     <ResourceSelectionBreadcrumbs
-      :ancestors="ancestors"
+      v-if="ancestors.length"
+      :ancestors="[...ancestors, content]"
       :channelsLink="channelsLink"
       :topicsLink="topicsLink"
       class="align-breadcrumbs"
@@ -40,7 +41,7 @@
       <h5>
         <KLabeledIcon :label="content.kind">
           <template #icon>
-            <LearningActivityIcon :kind="content.learning_activities" />
+            <LearningActivityIcon :kind="learningActivities" />
           </template>
           <template>
             {{ content.title }}
@@ -147,6 +148,11 @@
         type: Boolean,
         required: true,
       },
+      questions: {
+        type: Array,
+        required: false,
+        default: () => [],
+      },
     },
     data() {
       return {
@@ -182,6 +188,12 @@
 
         return undefined;
       },
+      learningActivities() {
+        if (this.content.learning_activities) {
+          return this.content.learning_activities;
+        }
+        return [];
+      },
     },
     methods: {
       topicsLink(topicId) {
diff --git a/kolibri/plugins/coach/assets/src/views/lessons/LessonSummaryPage/sidePanels/LessonResourceSelection/subPages/PreviewSelectedResources/index.vue b/kolibri/plugins/coach/assets/src/views/lessons/LessonSummaryPage/sidePanels/LessonResourceSelection/subPages/PreviewSelectedResources/index.vue
index 0271a610159..dd4c4d90e78 100644
--- a/kolibri/plugins/coach/assets/src/views/lessons/LessonSummaryPage/sidePanels/LessonResourceSelection/subPages/PreviewSelectedResources/index.vue
+++ b/kolibri/plugins/coach/assets/src/views/lessons/LessonSummaryPage/sidePanels/LessonResourceSelection/subPages/PreviewSelectedResources/index.vue
@@ -64,8 +64,8 @@
     },
     computed: {
       isSelected() {
-        if (this.selectedResources) {
-          return this.selectedResources.find(resource => resource.id === this.contentId);
+        if (this.selectedResources && this.contentNode) {
+          return this.selectedResources.some(resource => resource.id === this.contentNode.id);
         }
         return false;
       },