diff --git a/src/editors/EditorContainer.tsx b/src/editors/EditorContainer.tsx
index 90bd248766..c3962cf3b6 100644
--- a/src/editors/EditorContainer.tsx
+++ b/src/editors/EditorContainer.tsx
@@ -1,8 +1,15 @@
 import React from 'react';
-import { useLocation, useParams } from 'react-router-dom';
+import { useLocation, useParams, useSearchParams } from 'react-router-dom';
 import { getConfig } from '@edx/frontend-platform';
+import { useIntl } from '@edx/frontend-platform/i18n';
+import { Button, Hyperlink } from '@openedx/paragon';
+import { Warning as WarningIcon } from '@openedx/paragon/icons';
 
 import EditorPage from './EditorPage';
+import AlertMessage from '../generic/alert-message';
+import messages from './messages';
+import { getLibraryId } from '../generic/key-utils';
+import { createCorrectInternalRoute } from '../utils';
 
 interface Props {
   /** Course ID or Library ID */
@@ -25,15 +32,46 @@ const EditorContainer: React.FC<Props> = ({
   onClose,
   returnFunction,
 }) => {
+  const intl = useIntl();
   const { blockType, blockId } = useParams();
   const location = useLocation();
+  const [searchParams] = useSearchParams();
+  const upstreamLibRef = searchParams.get('upstreamLibRef');
 
   if (blockType === undefined || blockId === undefined) {
     // istanbul ignore next - This shouldn't be possible; it's just here to satisfy the type checker.
     return <div>Error: missing URL parameters</div>;
   }
+
+  const getLibraryBlockUrl = () => {
+    if (!upstreamLibRef) {
+      return '';
+    }
+    const libId = getLibraryId(upstreamLibRef);
+    return createCorrectInternalRoute(`/library/${libId}/components?usageKey=${upstreamLibRef}`);
+  };
+
   return (
     <div className="editor-page">
+      <AlertMessage
+        className="m-3"
+        show={upstreamLibRef}
+        variant="warning"
+        icon={WarningIcon}
+        title={intl.formatMessage(messages.libraryBlockEditWarningTitle)}
+        description={intl.formatMessage(messages.libraryBlockEditWarningDescription)}
+        actions={[
+          <Button
+            destination={getLibraryBlockUrl()}
+            target="_blank"
+            rel="noopener noreferrer"
+            showLaunchIcon
+            as={Hyperlink}
+          >
+            {intl.formatMessage(messages.libraryBlockEditWarningLink)}
+          </Button>,
+        ]}
+      />
       <EditorPage
         courseId={learningContextId}
         blockType={blockType}
diff --git a/src/editors/messages.ts b/src/editors/messages.ts
index 19ee3c0228..4b1134a270 100644
--- a/src/editors/messages.ts
+++ b/src/editors/messages.ts
@@ -22,6 +22,21 @@ const messages = defineMessages({
     defaultMessage: 'Upload MP4 or MOV files (5 GB max)',
     description: 'Info message for supported formats',
   },
+  libraryBlockEditWarningTitle: {
+    id: 'authoring.editorpage.libraryBlockEditWarningTitle',
+    defaultMessage: 'Editing Content from a Library',
+    description: 'Title text for Warning users editing library content in a course.',
+  },
+  libraryBlockEditWarningDescription: {
+    id: 'authoring.editorpage.libraryBlockEditWarningDescription',
+    defaultMessage: 'Edits made here will only be reflected in this course. These edits may be overridden later if updates are accepted.',
+    description: 'Description text for Warning users editing library content in a course.',
+  },
+  libraryBlockEditWarningLink: {
+    id: 'authoring.editorpage.libraryBlockEditWarningLink',
+    defaultMessage: 'View in Library',
+    description: 'Link text for opening library block in another tab.',
+  },
 });
 
 export default messages;