diff --git a/src/course-unit/CourseUnit.jsx b/src/course-unit/CourseUnit.jsx
index 75d9029163..f82d80dd98 100644
--- a/src/course-unit/CourseUnit.jsx
+++ b/src/course-unit/CourseUnit.jsx
@@ -177,7 +177,6 @@ const CourseUnit = ({ courseId }) => {
                         handleConfigureSubmit={handleConfigureSubmit}
                         unitXBlockActions={unitXBlockActions}
                         data-testid="course-xblock"
-                        className="course-unit__xblock"
                         userPartitionInfo={userPartitionInfo}
                       />
                     ))}
diff --git a/src/course-unit/course-xblock/CourseXBlock.jsx b/src/course-unit/course-xblock/CourseXBlock.jsx
index 5be8354b56..88058ee5a5 100644
--- a/src/course-unit/course-xblock/CourseXBlock.jsx
+++ b/src/course-unit/course-xblock/CourseXBlock.jsx
@@ -1,5 +1,6 @@
 import { useEffect, useRef } from 'react';
 import PropTypes from 'prop-types';
+import classNames from 'classnames';
 import { useDispatch, useSelector } from 'react-redux';
 import {
   ActionRow, Card, Dropdown, Icon, IconButton, useToggle,
@@ -78,7 +79,9 @@ const CourseXBlock = ({
     <div
       ref={courseXBlockElementRef}
       {...props}
-      className={isScrolledToElement ? 'xblock-highlight' : undefined}
+      className={classNames('course-unit__xblock', {
+        'xblock-highlight': isScrolledToElement,
+      })}
     >
       <Card
         as={SortableItem}