diff --git a/packages/block-library/src/archives/edit.js b/packages/block-library/src/archives/edit.js
index 60b8715988ed9..b51bd9a4fe1e6 100644
--- a/packages/block-library/src/archives/edit.js
+++ b/packages/block-library/src/archives/edit.js
@@ -2,10 +2,11 @@
  * WordPress dependencies
  */
 import {
-	PanelBody,
 	ToggleControl,
 	SelectControl,
 	Disabled,
+	__experimentalToolsPanel as ToolsPanel,
+	__experimentalToolsPanelItem as ToolsPanelItem,
 } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 import { InspectorControls, useBlockProps } from '@wordpress/block-editor';
@@ -17,55 +18,104 @@ export default function ArchivesEdit( { attributes, setAttributes } ) {
 	return (
 		<>
 			<InspectorControls>
-				<PanelBody title={ __( 'Settings' ) }>
-					<ToggleControl
-						__nextHasNoMarginBottom
+				<ToolsPanel
+					label={ __( 'Settings' ) }
+					resetAll={ () => {
+						setAttributes( {
+							displayAsDropdown: false,
+							showLabel: false,
+							showPostCounts: false,
+							type: 'monthly',
+						} );
+					} }
+				>
+					<ToolsPanelItem
 						label={ __( 'Display as dropdown' ) }
-						checked={ displayAsDropdown }
-						onChange={ () =>
-							setAttributes( {
-								displayAsDropdown: ! displayAsDropdown,
-							} )
+						isShownByDefault
+						hasValue={ () => displayAsDropdown }
+						onDeselect={ () =>
+							setAttributes( { displayAsDropdown: false } )
 						}
-					/>
-					{ displayAsDropdown && (
+					>
 						<ToggleControl
 							__nextHasNoMarginBottom
-							label={ __( 'Show label' ) }
-							checked={ showLabel }
+							label={ __( 'Display as dropdown' ) }
+							checked={ displayAsDropdown }
 							onChange={ () =>
 								setAttributes( {
-									showLabel: ! showLabel,
+									displayAsDropdown: ! displayAsDropdown,
 								} )
 							}
 						/>
+					</ToolsPanelItem>
+
+					{ displayAsDropdown && (
+						<ToolsPanelItem
+							label={ __( 'Show label' ) }
+							isShownByDefault
+							hasValue={ () => showLabel }
+							onDeselect={ () =>
+								setAttributes( { showLabel: false } )
+							}
+						>
+							<ToggleControl
+								__nextHasNoMarginBottom
+								label={ __( 'Show label' ) }
+								checked={ showLabel }
+								onChange={ () =>
+									setAttributes( {
+										showLabel: ! showLabel,
+									} )
+								}
+							/>
+						</ToolsPanelItem>
 					) }
-					<ToggleControl
-						__nextHasNoMarginBottom
+
+					<ToolsPanelItem
 						label={ __( 'Show post counts' ) }
-						checked={ showPostCounts }
-						onChange={ () =>
-							setAttributes( {
-								showPostCounts: ! showPostCounts,
-							} )
+						isShownByDefault
+						hasValue={ () => showPostCounts }
+						onDeselect={ () =>
+							setAttributes( { showPostCounts: false } )
 						}
-					/>
-					<SelectControl
-						__next40pxDefaultSize
-						__nextHasNoMarginBottom
+					>
+						<ToggleControl
+							__nextHasNoMarginBottom
+							label={ __( 'Show post counts' ) }
+							checked={ showPostCounts }
+							onChange={ () =>
+								setAttributes( {
+									showPostCounts: ! showPostCounts,
+								} )
+							}
+						/>
+					</ToolsPanelItem>
+
+					<ToolsPanelItem
 						label={ __( 'Group by' ) }
-						options={ [
-							{ label: __( 'Year' ), value: 'yearly' },
-							{ label: __( 'Month' ), value: 'monthly' },
-							{ label: __( 'Week' ), value: 'weekly' },
-							{ label: __( 'Day' ), value: 'daily' },
-						] }
-						value={ type }
-						onChange={ ( value ) =>
-							setAttributes( { type: value } )
+						isShownByDefault
+						hasValue={ () => !! type }
+						onDeselect={ () =>
+							setAttributes( { type: 'monthly' } )
 						}
-					/>
-				</PanelBody>
+					>
+						<SelectControl
+							__next40pxDefaultSize
+							__nextHasNoMarginBottom
+							label={ __( 'Group by' ) }
+							options={ [
+								{ label: __( 'Year' ), value: 'yearly' },
+								{ label: __( 'Month' ), value: 'monthly' },
+								{ label: __( 'Week' ), value: 'weekly' },
+								{ label: __( 'Day' ), value: 'daily' },
+							] }
+							value={ type }
+							onChange={ ( value ) =>
+								setAttributes( { type: value } )
+							}
+						/>
+					</ToolsPanelItem>
+				</ToolsPanel>
 			</InspectorControls>
 			<div { ...useBlockProps() }>
 				<Disabled>