diff --git a/src/block-components/icon/index.js b/src/block-components/icon/index.js
index 206baa9c5..8ff86ef79 100644
--- a/src/block-components/icon/index.js
+++ b/src/block-components/icon/index.js
@@ -62,6 +62,7 @@ export const Icon = props => {
 		attrNameTemplate = '%s',
 		hasLinearGradient = true,
 		value = '',
+		defaultValue = '',
 		onChange = NOOP,
 		openEvenIfUnselected = false,
 	} = props
@@ -177,6 +178,7 @@ export const Icon = props => {
 						}
 						setIsOpen( false )
 					} }
+					defaultValue={ defaultValue }
 				/>
 			) }
 			{ getAttribute( 'icon2' ) && (
diff --git a/src/block/icon/edit.js b/src/block/icon/edit.js
index f8c4cfd4f..9c522a597 100644
--- a/src/block/icon/edit.js
+++ b/src/block/icon/edit.js
@@ -84,7 +84,7 @@ const Edit = props => {
 				className={ blockClassNames }
 			>
 				<Link linkTrigger=".stk--inner-svg">
-					<Icon />
+					<Icon defaultValue={ defaultIcon } />
 				</Link>
 			</BlockDiv>
 			{ props.isHovered && <MarginBottom /> }
diff --git a/src/components/icon-control/index.js b/src/components/icon-control/index.js
index 2588bcd75..617f5ee98 100644
--- a/src/components/icon-control/index.js
+++ b/src/components/icon-control/index.js
@@ -31,6 +31,7 @@ const IconControl = props => {
 			{ ...omit( props, [ 'onChange', 'value' ] ) }
 			allowReset={ true }
 			value={ props.value }
+			defaultValue={ props.defaultValue }
 			onChange={ props.onChange }
 			hasPanelModifiedIndicator={ props.hasPanelModifiedIndicator }
 		>
@@ -54,6 +55,7 @@ const IconControl = props => {
 								onClose={ onClose }
 								returnSVGValue={ props.returnSVGValue }
 								onChange={ props.onChange }
+								defaultValue={ props.defaultValue }
 							/>
 						) }
 					/>
diff --git a/src/components/icon-search-popover/index.js b/src/components/icon-search-popover/index.js
index 272e81302..1d59f9cb7 100644
--- a/src/components/icon-search-popover/index.js
+++ b/src/components/icon-search-popover/index.js
@@ -231,7 +231,7 @@ const IconSearchPopover = props => {
 					{ props.allowReset &&
 						<Button
 							onClick={ () => {
-								props.onChange( '' )
+								props.onChange( props.defaultValue || '' )
 								props.onClose()
 							} }
 							isSmall