Force stop editing link to remove activeFormats

packages/format-library/src/link/index.js

@@ -11,6 +11,7 @@ import {
 	isCollapsed,
 	insert,
 	create,
+	concat,
 } from '@wordpress/rich-text';
 import { isURL, isEmail } from '@wordpress/url';
 import {
@@ -64,6 +65,18 @@ function Edit( {
 
 	function stopAddingLink( returnFocus = true ) {
 		setAddingLink( false );
+
+		// Remove any active formats.
+		// Cloning the existing value has the effect of removing
+		// any active formats and is roughly equivalent to the
+		// following mutation:
+		// value.activeFormats = [];
+		const newValue = concat( value );
+
+		// Update to force format to no longer be active.
+		onChange( newValue );
+
+		// Handle focus
 		if ( returnFocus ) {
 			onFocus();
 		}

packages/format-library/src/link/inline.js

@@ -89,12 +89,6 @@ function InlineLinkUI( {
 	}
 
 	function onChangeLink( nextValue ) {
-		// LinkControl calls `onChange` immediately upon the toggling a setting.
-		// Before merging the next value with the current link value, check if
-		// the setting was toggled.
-		const didToggleSetting =
-			linkValue.opensInNewTab !== nextValue.opensInNewTab &&
-			nextValue.url === undefined;
 		// Merge the next value with the current link value.
 		nextValue = {
 			...linkValue,
@@ -180,16 +174,9 @@ function InlineLinkUI( {
 			newValue.start = newValue.end;
 
 			// Hides the Link UI.
-			newValue.activeFormats = [];
 			onChange( newValue );
 		}
 
-		// Focus should only be shifted back to the formatted segment when the
-		// URL is submitted.
-		if ( ! didToggleSetting ) {
-			stopAddingLink();
-		}
-
 		if ( ! isValidHref( newUrl ) ) {
 			speak(
 				__(