diff --git a/edit-post/editor.js b/edit-post/editor.js
index 59b2d8e9933ea..1d016eede943a 100644
--- a/edit-post/editor.js
+++ b/edit-post/editor.js
@@ -2,9 +2,8 @@
  * WordPress dependencies
  */
 import { withSelect } from '@wordpress/data';
-import { EditorProvider, ErrorBoundary } from '@wordpress/editor';
+import { EditorProvider, ErrorBoundary, PostLockedModal } from '@wordpress/editor';
 import { StrictMode } from '@wordpress/element';
-import PostLockedModal from '../packages/components/src/post-locked-modal';
 /**
  * Internal dependencies
  */
diff --git a/packages/components/src/modal/style.scss b/packages/components/src/modal/style.scss
index e3f5f5027194a..df8256e4f222c 100644
--- a/packages/components/src/modal/style.scss
+++ b/packages/components/src/modal/style.scss
@@ -87,3 +87,28 @@
 	overflow: auto;
 	padding: $panel-padding;
 }
+
+.post-locked-modal {
+	max-height: 152px;
+	padding-right: 10px;
+	padding-left: 10px;
+	padding-top: 10px;
+	border: red;
+
+	a.button,
+	button.components-button {
+		margin: 5px;
+	}
+	img.components-modal__image {
+		float: left;
+		margin: 5px;
+		margin-right: 15px;
+	}
+
+	.components-modal__header {
+		height: 36px;
+	}
+	.components-modal__content {
+		overflow: hidden;
+	}
+}
diff --git a/packages/editor/src/components/index.js b/packages/editor/src/components/index.js
index 3e909f4f784f6..5d201d0f92551 100644
--- a/packages/editor/src/components/index.js
+++ b/packages/editor/src/components/index.js
@@ -77,6 +77,7 @@ export { default as PostVisibilityCheck } from './post-visibility/check';
 export { default as TableOfContents } from './table-of-contents';
 export { default as UnsavedChangesWarning } from './unsaved-changes-warning';
 export { default as WordCount } from './word-count';
+export { default as PostLockedModal } from './post-locked-modal';
 
 // Content Related Components
 export { default as BlockInspector } from './block-inspector';
diff --git a/packages/components/src/post-locked-modal/index.js b/packages/editor/src/components/post-locked-modal/index.js
similarity index 81%
rename from packages/components/src/post-locked-modal/index.js
rename to packages/editor/src/components/post-locked-modal/index.js
index 61489498c5eb7..f5b0c6b0d6252 100644
--- a/packages/components/src/post-locked-modal/index.js
+++ b/packages/editor/src/components/post-locked-modal/index.js
@@ -7,11 +7,11 @@ import { Component, Fragment } from '@wordpress/element';
 import { withSelect } from '@wordpress/data';
 import {
 	PostPreviewButton,
-} from '@wordpress/editor';
-import './style.scss';
+} from '../post-preview-button';
+
 import { addQueryArgs } from '@wordpress/url';
-import { getPostEditURL } from '../../../../edit-post/components/browser-url';
-import { getWPAdminURL } from '../../../editor/src/utils/url';
+import { getPostEditURL } from '../../../../../edit-post/components/browser-url';
+import { getWPAdminURL } from '../../../src/utils/url';
 
 class PostLockedModal extends Component {
 	constructor() {
@@ -69,23 +69,19 @@ class PostLockedModal extends Component {
 								{
 									this.takeover ?
 										<p>
-											<a href={ getWPAdminURL( 'edit.php' ) }>
+											<a href={ getWPAdminURL( 'edit.php' ) } className={ 'button' }>
 												{ __( 'View all posts' ) }
 											</a>
 										</p> :
-										<a href={ allPosts } >
-											<button className={ 'button' } >
-												{ __( 'All Posts' ) }
-											</button>
+										<a href={ allPosts } className={ 'button' }>
+											{ __( 'All Posts' ) }
 										</a>
 								}
 								{ ! this.takeover &&
 									<span>
 										<PostPreviewButton />
-										<a href={ unlockUrl }>
-											<button className="button button-primary" >
-												{ __( 'Take Over' ) }
-											</button>
+										<a href={ unlockUrl } className={ 'button button-primary' }>
+											{ __( 'Take Over' ) }
 										</a>
 									</span>
 								}
diff --git a/packages/components/src/post-locked-modal/style.scss b/packages/editor/src/components/post-locked-modal/style.scss
similarity index 96%
rename from packages/components/src/post-locked-modal/style.scss
rename to packages/editor/src/components/post-locked-modal/style.scss
index 6ad3982f9f71e..d01e1c41b971e 100644
--- a/packages/components/src/post-locked-modal/style.scss
+++ b/packages/editor/src/components/post-locked-modal/style.scss
@@ -3,6 +3,7 @@
 	padding-right: 10px;
 	padding-left: 10px;
 	padding-top: 10px;
+	border: red;
 
 	button.button,
 	button.components-button {