diff --git a/src/course-unit/CourseUnit.test.jsx b/src/course-unit/CourseUnit.test.jsx
index e168ec09e..6985d3ce0 100644
--- a/src/course-unit/CourseUnit.test.jsx
+++ b/src/course-unit/CourseUnit.test.jsx
@@ -709,12 +709,6 @@ describe('<CourseUnit />', () => {
       userEvent.click(problemButton);
     });
 
-    await waitFor(() => {
-      expect(screen.getByRole('heading', {
-        name: new RegExp(`${addComponentMessages.blockEditorModalTitle.defaultMessage}`, 'i'),
-      })).toBeInTheDocument();
-    });
-
     axiosMock
       .onGet(getCourseUnitApiUrl(blockId))
       .reply(200, courseUnitIndexMock);
diff --git a/src/course-unit/add-component/AddComponent.jsx b/src/course-unit/add-component/AddComponent.jsx
index 2b169965a..1b3240a19 100644
--- a/src/course-unit/add-component/AddComponent.jsx
+++ b/src/course-unit/add-component/AddComponent.jsx
@@ -252,13 +252,7 @@ const AddComponent = ({
             />
           </div>
         </StandardModal>
-        <StandardModal
-          title={intl.formatMessage(messages.blockEditorModalTitle)}
-          isOpen={isXBlockEditorModalOpen}
-          onClose={closeXBlockEditorModal}
-          isOverflowVisible={false}
-          size="xl"
-        >
+        {isXBlockEditorModalOpen && (
           <div className="editor-page">
             <EditorPage
               courseId={courseId}
@@ -271,7 +265,7 @@ const AddComponent = ({
               returnFunction={/* istanbul ignore next */ () => onXBlockSave}
             />
           </div>
-        </StandardModal>
+        )}
       </div>
     );
   }
diff --git a/src/course-unit/add-component/messages.js b/src/course-unit/add-component/messages.js
index f737a3bd3..117430edb 100644
--- a/src/course-unit/add-component/messages.js
+++ b/src/course-unit/add-component/messages.js
@@ -36,11 +36,6 @@ const messages = defineMessages({
     defaultMessage: 'Select video',
     description: 'Video picker modal title.',
   },
-  blockEditorModalTitle: {
-    id: 'course-authoring.course-unit.modal.block-editor-title.text',
-    defaultMessage: 'Edit component',
-    description: 'Block editor modal title.',
-  },
   modalContainerTitle: {
     id: 'course-authoring.course-unit.modal.container.title',
     defaultMessage: 'Add {componentTitle} component',
diff --git a/src/course-unit/xblock-container-iframe/index.tsx b/src/course-unit/xblock-container-iframe/index.tsx
index dac95c96a..48be568b2 100644
--- a/src/course-unit/xblock-container-iframe/index.tsx
+++ b/src/course-unit/xblock-container-iframe/index.tsx
@@ -218,13 +218,7 @@ const XBlockContainerIframe: FC<XBlockContainerIframeProps> = ({
           />
         </div>
       </StandardModal>
-      <StandardModal
-        title={intl.formatMessage(messages.blockEditorModalTitle)}
-        isOpen={isXBlockEditorModalOpen}
-        onClose={closeXBlockEditorModal}
-        isOverflowVisible={false}
-        size="xl"
-      >
+      {isXBlockEditorModalOpen && (
         <div className="editor-page">
           <EditorPage
             courseId={courseId}
@@ -237,7 +231,7 @@ const XBlockContainerIframe: FC<XBlockContainerIframeProps> = ({
             returnFunction={/* istanbul ignore next */ () => onXBlockSave}
           />
         </div>
-      </StandardModal>
+      )}
       {Object.keys(accessManagedXBlockData).length ? (
         <ConfigureModal
           isXBlockComponent
diff --git a/src/course-unit/xblock-container-iframe/messages.ts b/src/course-unit/xblock-container-iframe/messages.ts
index 967ded524..2aa919e88 100644
--- a/src/course-unit/xblock-container-iframe/messages.ts
+++ b/src/course-unit/xblock-container-iframe/messages.ts
@@ -19,11 +19,6 @@ const messages = defineMessages({
     id: 'course-authoring.course-unit.xblock.video-editor.title',
     defaultMessage: 'Select video',
   },
-  blockEditorModalTitle: {
-    id: 'course-authoring.course-unit.xblock.editor.title',
-    defaultMessage: 'Edit component',
-    description: 'Block editor modal title.',
-  },
 });
 
 export default messages;