diff --git a/packages/block-library/src/navigation-link/edit.js b/packages/block-library/src/navigation-link/edit.js
index 0add25f99a4b5..750ea17ec370a 100644
--- a/packages/block-library/src/navigation-link/edit.js
+++ b/packages/block-library/src/navigation-link/edit.js
@@ -156,6 +156,7 @@ function NavigationLinkEdit( {
 			>
 				<div className="wp-block-navigation-link__content">
 					<RichText
+						tagName="span"
 						value={ label }
 						onChange={ ( labelValue ) => setAttributes( { label: labelValue } ) }
 						placeholder={ itemLabelPlaceholder }
@@ -168,9 +169,9 @@ function NavigationLinkEdit( {
 						] }
 					/>
 					{ showSubmenuIcon &&
-						<div className="wp-block-navigation-link__submenu-icon">
+						<span className="wp-block-navigation-link__submenu-icon">
 							{ itemSubmenuIcon }
-						</div>
+						</span>
 					}
 					{ isLinkOpen && (
 						<Popover position="bottom center">