diff --git a/src/search-modal/SearchUI.test.tsx b/src/search-modal/SearchUI.test.tsx
index 92f0f244d3..e5c1cd643a 100644
--- a/src/search-modal/SearchUI.test.tsx
+++ b/src/search-modal/SearchUI.test.tsx
@@ -175,7 +175,8 @@ describe('<SearchUI />', () => {
     expect(fetchMock).toHaveLastFetched((_url, req) => {
       const requestData = JSON.parse(req.body?.toString() ?? '');
       const requestedFilter = requestData?.queries[0].filter;
-      return requestedFilter?.[0] === 'context_key = "course-v1:org+test+123"';
+      return requestedFilter?.[0] === 'type = "course_block"'
+        && requestedFilter?.[1] === 'context_key = "course-v1:org+test+123"';
     });
     // Now we should see the results:
     expect(queryByText('Enter a keyword')).toBeNull();
@@ -394,7 +395,8 @@ describe('<SearchUI />', () => {
       expect(fetchMock).toHaveLastFetched((_url, req) => {
         const requestData = JSON.parse(req.body?.toString() ?? '');
         const requestedFilter = requestData?.queries[0].filter;
-        return (requestedFilter?.length === 1); // the filter is: 'context_key = "course-v1:org+test+123"'
+        // the filter is: ['type = "course_block"', 'context_key = "course-v1:org+test+123"']
+        return (requestedFilter?.length === 2);
       });
       // Now we should see the results:
       expect(getByText('6 results found')).toBeInTheDocument();
@@ -419,6 +421,7 @@ describe('<SearchUI />', () => {
         const requestData = JSON.parse(req.body?.toString() ?? '');
         const requestedFilter = requestData?.queries[0].filter;
         return JSON.stringify(requestedFilter) === JSON.stringify([
+          'type = "course_block"',
           'context_key = "course-v1:org+test+123"',
           ['block_type = problem'], // <-- the newly added filter, sent with the request
         ]);
@@ -444,6 +447,7 @@ describe('<SearchUI />', () => {
         const requestData = JSON.parse(req.body?.toString() ?? '');
         const requestedFilter = requestData?.queries?.[0]?.filter;
         return JSON.stringify(requestedFilter) === JSON.stringify([
+          'type = "course_block"',
           'context_key = "course-v1:org+test+123"',
           'tags.taxonomy = "ESDC Skills and Competencies"', // <-- the newly added filter, sent with the request
         ]);
@@ -477,6 +481,7 @@ describe('<SearchUI />', () => {
         const requestData = JSON.parse(req.body?.toString() ?? '');
         const requestedFilter = requestData?.queries?.[0]?.filter;
         return JSON.stringify(requestedFilter) === JSON.stringify([
+          'type = "course_block"',
           'context_key = "course-v1:org+test+123"',
           'tags.level0 = "ESDC Skills and Competencies > Abilities"',
         ]);
diff --git a/src/search-modal/SearchUI.tsx b/src/search-modal/SearchUI.tsx
index 1ce23a8dbd..e46933dd99 100644
--- a/src/search-modal/SearchUI.tsx
+++ b/src/search-modal/SearchUI.tsx
@@ -27,7 +27,10 @@ const SearchUI: React.FC<{ courseId: string, closeSearchModal?: () => void }> =
 
   return (
     <SearchContextProvider
-      extraFilter={searchThisCourse ? `context_key = "${props.courseId}"` : undefined}
+      extraFilter={[
+        'type = "course_block"',
+        ...(searchThisCourse ? [`context_key = "${props.courseId}"`] : []),
+      ]}
       closeSearchModal={props.closeSearchModal}
     >
       {/* We need to override z-index here or the <Dropdown.Menu> appears behind the <ModalDialog.Body>