From ecd728f0260045f04ea92bf3a68fdd5be6c003db Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Wed, 2 Nov 2022 11:59:41 +0000
Subject: [PATCH] Use correct resolution state

---
 packages/block-library/src/navigation/edit/index.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/block-library/src/navigation/edit/index.js b/packages/block-library/src/navigation/edit/index.js
index 29292fa532403..171e5346b7ede 100644
--- a/packages/block-library/src/navigation/edit/index.js
+++ b/packages/block-library/src/navigation/edit/index.js
@@ -207,6 +207,7 @@ function Navigation( {
 
 	const {
 		hasResolvedNavigationMenus,
+		isResolvingNavigationMenus,
 		isNavigationMenuResolved,
 		isNavigationMenuMissing,
 		navigationMenus,
@@ -342,7 +343,7 @@ function Navigation( {
 	// - there is a ref attribute pointing to a Navigation Post
 	// - the Navigation Post isn't available (hasn't resolved) yet.
 	const isLoading =
-		! hasResolvedNavigationMenus ||
+		isResolvingNavigationMenus ||
 		isCreatingNavigationMenu ||
 		isConvertingClassicMenu ||
 		!! ( ref && ! isEntityAvailable && ! isConvertingClassicMenu );