diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/collection-font-variant.js b/packages/edit-site/src/components/global-styles/font-library-modal/collection-font-variant.js
index 0719cb873f8f7..105c8e9ff81d9 100644
--- a/packages/edit-site/src/components/global-styles/font-library-modal/collection-font-variant.js
+++ b/packages/edit-site/src/components/global-styles/font-library-modal/collection-font-variant.js
@@ -1,20 +1,14 @@
/**
* WordPress dependencies
*/
-import {
- CheckboxControl,
- Flex,
- privateApis as componentsPrivateApis,
-} from '@wordpress/components';
+import { useId } from '@wordpress/element';
+import { CheckboxControl, Flex } from '@wordpress/components';
/**
* Internal dependencies
*/
import { getFontFaceVariantName } from './utils';
import FontDemo from './font-demo';
-import { unlock } from '../../../lock-unlock';
-
-const { kebabCase } = unlock( componentsPrivateApis );
function CollectionFontVariant( {
face,
@@ -31,9 +25,7 @@ function CollectionFontVariant( {
};
const displayName = font.name + ' ' + getFontFaceVariantName( face );
- const checkboxId = kebabCase(
- `${ font.slug }-${ getFontFaceVariantName( face ) }`
- );
+ const checkboxId = useId();
return (
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/library-font-variant.js b/packages/edit-site/src/components/global-styles/font-library-modal/library-font-variant.js
index 2f84bd1f2c749..24a1d54871f6b 100644
--- a/packages/edit-site/src/components/global-styles/font-library-modal/library-font-variant.js
+++ b/packages/edit-site/src/components/global-styles/font-library-modal/library-font-variant.js
@@ -1,12 +1,8 @@
/**
* WordPress dependencies
*/
-import { useContext } from '@wordpress/element';
-import {
- CheckboxControl,
- Flex,
- privateApis as componentsPrivateApis,
-} from '@wordpress/components';
+import { useContext, useId } from '@wordpress/element';
+import { CheckboxControl, Flex } from '@wordpress/components';
/**
* Internal dependencies
@@ -14,9 +10,6 @@ import {
import { getFontFaceVariantName } from './utils';
import { FontLibraryContext } from './context';
import FontDemo from './font-demo';
-import { unlock } from '../../../lock-unlock';
-
-const { kebabCase } = unlock( componentsPrivateApis );
function LibraryFontVariant( { face, font } ) {
const { isFontActivated, toggleActivateFont } =
@@ -41,9 +34,7 @@ function LibraryFontVariant( { face, font } ) {
};
const displayName = font.name + ' ' + getFontFaceVariantName( face );
- const checkboxId = kebabCase(
- `${ font.slug }-${ getFontFaceVariantName( face ) }`
- );
+ const checkboxId = useId();
return (