diff --git a/packages/components/src/panel/style.scss b/packages/components/src/panel/style.scss
index 9b8177f4cb318c..b52be9f2b16cdb 100644
--- a/packages/components/src/panel/style.scss
+++ b/packages/components/src/panel/style.scss
@@ -61,22 +61,20 @@
 	margin-top: 0;
 	margin-bottom: 0;
 	transition: 0.1s background ease-in-out;
-
-	&:hover {
-		background: $light-gray-100;
-
-		.components-button,
-		.components-panel__arrow {
-			color: $dark-gray-900;
-		}
-	}
 }
 .components-panel__body.is-opened > .components-panel__body-title {
 	margin: -1 * $panel-padding;
 	margin-bottom: 5px;
+}
+
+// Hover States
+.components-panel__body:not(.is-opened) > .components-panel__body-title:hover,
+.edit-post-last-revision__panel > .components-icon-button:not(:disabled):not([aria-disabled="true"]):not(.is-default):hover {
+	background: $light-gray-100;
 
-	&:hover {
-		background: transparent;
+	.components-button,
+	.components-panel__arrow {
+		color: $dark-gray-900;
 	}
 }