@@ -7,6 +7,7 @@ import {
 	useEffect,
 	useLayoutEffect,
 	useMemo,
+	useRef,
 } from '@wordpress/element';
 
 /**
@@ -142,6 +143,11 @@ export function useToolsPanelItem(
 		isShownByDefault,
 	] );
 
+	// Tracks whether the item was explicitly shown by a user menu action.
+	// This allows onDeselect to fire even when hasValue() is false, but only
+	// for items the user intentionally toggled on.
+	const wasShownByUserRef = useRef( false );
+
 	// Determine if the panel item's corresponding menu is being toggled and
 	// trigger appropriate callback if it is.
 	useEffect( () => {
@@ -153,11 +159,15 @@ export function useToolsPanelItem(
 		}
 
 		if ( isMenuItemChecked && ! isValueSet && ! wasMenuItemChecked ) {
+			wasShownByUserRef.current = true;
 			onSelect?.();
 		}
 
 		if ( ! isMenuItemChecked && wasMenuItemChecked ) {
-			onDeselect?.();
+			if ( isValueSet || wasShownByUserRef.current ) {
+				onDeselect?.();
+			}
+			wasShownByUserRef.current = false;
 		}
 	}, [
 		hasMatchingPanel,