diff --git a/packages/block-library/src/navigation/block.json b/packages/block-library/src/navigation/block.json
index 809edb9965902..bb447f9654c0c 100644
--- a/packages/block-library/src/navigation/block.json
+++ b/packages/block-library/src/navigation/block.json
@@ -105,7 +105,10 @@
 				"rem",
 				"vh",
 				"vw"
-			]
+			],
+			"__experimentalDefaultControls": {
+				"blockGap": true
+			}
 		}
 	},
 	"viewScript": "file:./view.min.js",
diff --git a/packages/block-library/src/navigation/style.scss b/packages/block-library/src/navigation/style.scss
index 14dcdea7f173e..b0911b054d784 100644
--- a/packages/block-library/src/navigation/style.scss
+++ b/packages/block-library/src/navigation/style.scss
@@ -229,8 +229,7 @@
 .wp-block-navigation,
 .wp-block-navigation .wp-block-page-list,
 .wp-block-navigation__container {
-	row-gap: calc(var(--wp--style--block-gap, 2em) / 4);
-	column-gap: var(--wp--style--block-gap, 2em);
+	gap: calc(var(--wp--style--block-gap, 2em) / 4) var(--wp--style--block-gap, 2em);
 }
 
 // Menu items with background.
@@ -241,8 +240,7 @@
 	&,
 	.wp-block-navigation .wp-block-page-list,
 	.wp-block-navigation__container {
-		row-gap: calc(var(--wp--style--block-gap, 0) / 4);
-		column-gap: var(--wp--style--block-gap, 0.5em);
+		gap: calc(var(--wp--style--block-gap, 0) / 4) var(--wp--style--block-gap, 0.5em);
 	}
 }