diff --git a/kolibri/plugins/coach/assets/src/composables/useFetchContentNode.js b/kolibri/plugins/coach/assets/src/composables/useFetchContentNode.js
index 5da15d364b..48443ba9c8 100644
--- a/kolibri/plugins/coach/assets/src/composables/useFetchContentNode.js
+++ b/kolibri/plugins/coach/assets/src/composables/useFetchContentNode.js
@@ -1,5 +1,6 @@
-import { ref, getCurrentInstance } from 'vue';
+import { ref, getCurrentInstance, computed } from 'vue';
 import ContentNodeResource from 'kolibri-common/apiResources/ContentNodeResource';
+import { exerciseToQuestionArray } from '../utils/selectQuestions';
 
 export default function useFetchContentNode(contentId) {
   const contentNode = ref({});
@@ -30,6 +31,8 @@ export default function useFetchContentNode(contentId) {
       });
   };
 
+  const exerciseQuestions = computed(() => exerciseToQuestionArray(contentNode.value));
+
   fetchContentNode();
 
   return {
@@ -37,5 +40,6 @@ export default function useFetchContentNode(contentId) {
     ancestors,
     contentNode,
     questions,
+    exerciseQuestions,
   };
 }
diff --git a/kolibri/plugins/coach/assets/src/composables/useFetchExercise.js b/kolibri/plugins/coach/assets/src/composables/useFetchExercise.js
deleted file mode 100644
index 6ae7b947e5..0000000000
--- a/kolibri/plugins/coach/assets/src/composables/useFetchExercise.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import { computed } from 'vue';
-import { exerciseToQuestionArray } from '../utils/selectQuestions';
-
-export default function useFetchExercise(exercise) {
-  const questions = computed(() => exerciseToQuestionArray(exercise));
-
-  const activeResourceMap = computed(() => {
-    return exercise;
-  });
-
-  return {
-    questions,
-    activeResourceMap,
-  };
-}
diff --git a/kolibri/plugins/coach/assets/src/views/common/QuestionsAccordion.vue b/kolibri/plugins/coach/assets/src/views/common/QuestionsAccordion.vue
index c688904902..f32df77899 100644
--- a/kolibri/plugins/coach/assets/src/views/common/QuestionsAccordion.vue
+++ b/kolibri/plugins/coach/assets/src/views/common/QuestionsAccordion.vue
@@ -5,7 +5,7 @@
       <div class="questions-accordion-header">
         <div>
           <KCheckbox
-            v-if="isCheckBoxVisible"
+            v-if="isSelectable"
             ref="selectAllCheckbox"
             class="select-all-box"
             :label="selectAllLabel$()"
@@ -59,28 +59,27 @@
             }"
           >
             <template #leading-actions>
-              <div v-if="isCheckBoxVisible">
-                <DragHandle>
-                  <div>
-                    <DragSortWidget
-                      :moveUpText="upLabel$"
-                      :moveDownText="downLabel$"
-                      :noDrag="true"
-                      :isFirst="index === 0"
-                      :isLast="index === questions.length - 1"
-                      @moveUp="() => handleKeyboardDragUp(index)"
-                      @moveDown="() => handleKeyboardDragDown(index)"
-                    />
-                  </div>
-                </DragHandle>
-                <KCheckbox
-                  class="accordion-item-checkbox"
-                  :checked="selectedQuestions.includes(question.item)"
-                  @change="
-                    (value, $event) => handleQuestionCheckboxChange(question.item, value, $event)
-                  "
-                />
-              </div>
+              <DragHandle v-if="isSelectable">
+                <div>
+                  <DragSortWidget
+                    :moveUpText="upLabel$"
+                    :moveDownText="downLabel$"
+                    :noDrag="true"
+                    :isFirst="index === 0"
+                    :isLast="index === questions.length - 1"
+                    @moveUp="() => handleKeyboardDragUp(index)"
+                    @moveDown="() => handleKeyboardDragDown(index)"
+                  />
+                </div>
+              </DragHandle>
+              <KCheckbox
+                v-if="isSelectable"
+                class="accordion-item-checkbox"
+                :checked="selectedQuestions.includes(question.item)"
+                @change="
+                  (value, $event) => handleQuestionCheckboxChange(question.item, value, $event)
+                "
+              />
             </template>
             <template #content>
               <div
@@ -171,7 +170,8 @@
       },
       selectedQuestions: {
         type: Array,
-        required: true,
+        required: false,
+        default: () => [],
       },
       selectAllIsChecked: {
         type: Boolean,
@@ -181,7 +181,7 @@
         type: Boolean,
         required: false,
       },
-      isCheckBoxVisible: {
+      isSelectable: {
         type: Boolean,
         required: false,
         default: true,
diff --git a/kolibri/plugins/coach/assets/src/views/lessons/LessonSummaryPage/sidePanels/LessonResourceSelection/subPages/PreviewSelectedResources/PreviewExercise.vue b/kolibri/plugins/coach/assets/src/views/lessons/LessonSummaryPage/sidePanels/LessonResourceSelection/subPages/PreviewSelectedResources/PreviewExercise.vue
new file mode 100644
index 0000000000..9e029738ad
--- /dev/null
+++ b/kolibri/plugins/coach/assets/src/views/lessons/LessonSummaryPage/sidePanels/LessonResourceSelection/subPages/PreviewSelectedResources/PreviewExercise.vue
@@ -0,0 +1,36 @@
+<template>
+
+  <div>
+    <QuestionsAccordion
+      :questions="questions"
+      :getQuestionContent="() => contentNode"
+      :isSelectable="false"
+    />
+  </div>
+
+</template>
+
+
+<script>
+
+  import QuestionsAccordion from '../../../../../../common/QuestionsAccordion.vue';
+
+  export default {
+    name: 'PreviewExercise',
+    components: {
+      QuestionsAccordion,
+    },
+
+    props: {
+      contentNode: {
+        type: Object,
+        required: true,
+      },
+      questions: {
+        type: Array,
+        required: true,
+      },
+    },
+  };
+
+</script>
diff --git a/kolibri/plugins/coach/assets/src/views/lessons/LessonSummaryPage/sidePanels/LessonResourceSelection/subPages/PreviewSelectedResources/PreviewSelectedExercise.vue b/kolibri/plugins/coach/assets/src/views/lessons/LessonSummaryPage/sidePanels/LessonResourceSelection/subPages/PreviewSelectedResources/PreviewSelectedExercise.vue
deleted file mode 100644
index fe01c39f5c..0000000000
--- a/kolibri/plugins/coach/assets/src/views/lessons/LessonSummaryPage/sidePanels/LessonResourceSelection/subPages/PreviewSelectedResources/PreviewSelectedExercise.vue
+++ /dev/null
@@ -1,40 +0,0 @@
-<template>
-
-  <div>
-    <QuestionsAccordion
-      :questions="questions"
-      :selectedQuestions="[]"
-      :getQuestionContent="() => activeResourceMap"
-      :isCheckBoxVisible="false"
-    />
-  </div>
-
-</template>
-
-
-<script>
-
-  import QuestionsAccordion from '../../../../../../common/QuestionsAccordion.vue';
-  import useFetchExercise from '../../../../../../../composables/useFetchExercise';
-
-  export default {
-    name: 'PreviewSelectedExercise',
-    components: {
-      QuestionsAccordion,
-    },
-    setup(props) {
-      const { questions, activeResourceMap } = useFetchExercise(props.contentNode);
-      return {
-        questions,
-        activeResourceMap,
-      };
-    },
-    props: {
-      contentNode: {
-        type: Object,
-        required: true,
-      },
-    },
-  };
-
-</script>
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 de6012b9d9..dcf9b3fe1f 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
@@ -47,9 +47,10 @@
         </KLabeledIcon>
       </h2>
 
-      <PreviewSelectedExercise
+      <PreviewExercise
         v-if="isExercise"
         :contentNode="contentNode"
+        :questions="exerciseQuestions"
       />
 
       <PreviewContent
@@ -75,13 +76,13 @@
   import { PageNames } from '../../../../../../../constants/index';
   import ResourceSelectionBreadcrumbs from '../../../../../LessonResourceSelectionPage/SearchTools/ResourceSelectionBreadcrumbs.vue';
   import PreviewContent from './PreviewContent';
-  import PreviewSelectedExercise from './PreviewSelectedExercise.vue';
+  import PreviewExercise from './PreviewExercise.vue';
 
   export default {
     name: 'PreviewSelectedResources',
     components: {
       PreviewContent,
-      PreviewSelectedExercise,
+      PreviewExercise,
       ResourceSelectionBreadcrumbs,
       LearningActivityIcon,
     },
@@ -91,7 +92,9 @@
       const instance = getCurrentInstance();
       const { addText$, addedIndicator$ } = searchAndFilterStrings;
 
-      const { contentNode, ancestors, questions, loading } = useFetchContentNode(props.contentId);
+      const { contentNode, ancestors, questions, loading, exerciseQuestions } = useFetchContentNode(
+        props.contentId,
+      );
       const { manageLessonResourcesTitle$ } = coachStrings;
 
       props.setTitle(manageLessonResourcesTitle$());
@@ -111,6 +114,7 @@
         ancestors,
         questions,
         loading,
+        exerciseQuestions,
         routeBack,
         // eslint-disable-next-line vue/no-unused-properties
         previousRoute,