diff --git a/src/components/block-styles-control/index.js b/src/components/block-styles-control/index.js
index 0b5efd7558..c8167863c0 100644
--- a/src/components/block-styles-control/index.js
+++ b/src/components/block-styles-control/index.js
@@ -33,7 +33,7 @@ import {
 	useEffect,
 	useMemo, useRef, useState,
 } from '@wordpress/element'
-import { useSelect } from '@wordpress/data'
+import { useSelect, dispatch } from '@wordpress/data'
 import { getBlockType } from '@wordpress/blocks'
 import { applyFilters, doAction } from '@wordpress/hooks'
 
@@ -199,6 +199,9 @@ export const BlockStylesControl = props => {
 		}
 
 		setAttributes( { ...defaultBlockAttributes, modifiedBlockStyle: false } )
+
+		// Reset to normal state after selecting block style
+		dispatch( 'stackable/hover-state' ).updateHoverState( 'normal' )
 	}
 
 	const onSelectBlockStyle = ( option, index ) => {
diff --git a/src/util/index.js b/src/util/index.js
index 2f8c4a8f7e..c3928cca33 100644
--- a/src/util/index.js
+++ b/src/util/index.js
@@ -296,7 +296,7 @@ export const prependCSSClass = ( cssSelector, mainClassName = '', uniqueClassNam
 			}
 
 			if ( hasHoverStateSelector && hoverStateSelector && wrapSelector ) {
-				return `${ hoverStateSelector }${ wrapSelector } ${ newSelector }`
+				return `${ wrapSelector }:where(${ hoverStateSelector }) ${ newSelector }`
 			}
 
 			return wrapSelector ? `${ wrapSelector } ${ newSelector }` : newSelector