diff --git a/packages/block-editor/src/components/link-control/index.js b/packages/block-editor/src/components/link-control/index.js
index a208fa20d242ff..c02855d1e226a9 100644
--- a/packages/block-editor/src/components/link-control/index.js
+++ b/packages/block-editor/src/components/link-control/index.js
@@ -330,8 +330,7 @@ function LinkControl( {
 
 	const currentInputIsEmpty = ! currentUrlInputValue?.trim()?.length;
 
-	const shownUnlinkControl =
-		onRemove && value && ! isEditingLink && ! isCreatingPage;
+	const shownUnlinkControl = onRemove && value && ! isCreatingPage;
 
 	const showActions = isEditingLink && hasLinkValue;
 
@@ -356,6 +355,41 @@ function LinkControl( {
 				</div>
 			) }
 
+			{ hasLinkValue && ! isCreatingPage && (
+				<LinkPreview
+					key={ value?.url } // force remount when URL changes to avoid race conditions for rich previews
+					value={ value }
+					isEditing={ isEditing }
+					onEditClick={ () => setIsEditingLink( true ) }
+					hasRichPreviews={ hasRichPreviews }
+					hasUnlinkControl={ shownUnlinkControl }
+					additionalControls={ () => {
+						// Expose the "Opens in new tab" settings in the preview
+						// as it is the most common setting to change.
+						if (
+							! isEditing &&
+							settings?.find(
+								( setting ) => setting.id === 'opensInNewTab'
+							)
+						) {
+							return (
+								<LinkSettings
+									value={ internalControlValue }
+									settings={ settings?.filter(
+										( { id } ) => id === 'opensInNewTab'
+									) }
+									onChange={ onChange }
+								/>
+							);
+						}
+					} }
+					onRemove={ () => {
+						onRemove();
+						setIsEditingLink( true );
+					} }
+				/>
+			) }
+
 			{ isEditing && (
 				<>
 					<div
@@ -377,6 +411,7 @@ function LinkControl( {
 								size="__unstable-large"
 							/>
 						) }
+
 						<LinkControlSearchInput
 							currentLink={ value }
 							className="block-editor-link-control__field block-editor-link-control__search-input"
@@ -420,39 +455,6 @@ function LinkControl( {
 				</>
 			) }
 
-			{ value && ! isEditingLink && ! isCreatingPage && (
-				<LinkPreview
-					key={ value?.url } // force remount when URL changes to avoid race conditions for rich previews
-					value={ value }
-					onEditClick={ () => setIsEditingLink( true ) }
-					hasRichPreviews={ hasRichPreviews }
-					hasUnlinkControl={ shownUnlinkControl }
-					additionalControls={ () => {
-						// Expose the "Opens in new tab" settings in the preview
-						// as it is the most common setting to change.
-						if (
-							settings?.find(
-								( setting ) => setting.id === 'opensInNewTab'
-							)
-						) {
-							return (
-								<LinkSettings
-									value={ internalControlValue }
-									settings={ settings?.filter(
-										( { id } ) => id === 'opensInNewTab'
-									) }
-									onChange={ onChange }
-								/>
-							);
-						}
-					} }
-					onRemove={ () => {
-						onRemove();
-						setIsEditingLink( true );
-					} }
-				/>
-			) }
-
 			{ showSettings && (
 				<div className="block-editor-link-control__tools">
 					{ ! currentInputIsEmpty && (
diff --git a/packages/block-editor/src/components/link-control/link-preview.js b/packages/block-editor/src/components/link-control/link-preview.js
index 5a5a30969d013c..09b8b48dbc0135 100644
--- a/packages/block-editor/src/components/link-control/link-preview.js
+++ b/packages/block-editor/src/components/link-control/link-preview.js
@@ -31,6 +31,7 @@ export default function LinkPreview( {
 	hasUnlinkControl = false,
 	onRemove,
 	additionalControls,
+	isEditing,
 } ) {
 	// Avoid fetching if rich previews are not desired.
 	const showRichPreviews = hasRichPreviews ? value?.url : null;
@@ -120,7 +121,9 @@ export default function LinkPreview( {
 					className="block-editor-link-control__search-item-action"
 					onClick={ onEditClick }
 					size="compact"
+					disabled={ isEditing }
 				/>
+
 				{ hasUnlinkControl && (
 					<Button
 						icon={ linkOff }
diff --git a/packages/block-editor/src/components/link-control/style.scss b/packages/block-editor/src/components/link-control/style.scss
index 7b6470df435437..4cc8cdf9b5d213 100644
--- a/packages/block-editor/src/components/link-control/style.scss
+++ b/packages/block-editor/src/components/link-control/style.scss
@@ -172,6 +172,7 @@ $block-editor-link-control-number-of-actions: 1;
 		width: 100%;
 		cursor: default;
 		padding: $grid-unit-20;
+		border-bottom: 1px solid $gray-200;
 	}
 
 	.block-editor-link-control__search-item-header {