diff --git a/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/state/FocusableComponentState.kt b/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/state/FocusableComponentState.kt
index b62c77b19..bd10dd7b7 100644
--- a/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/state/FocusableComponentState.kt
+++ b/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/state/FocusableComponentState.kt
@@ -18,7 +18,8 @@ public interface FocusableComponentState : InteractiveComponentState {
         when {
             !isEnabled -> disabled
             isPressed && !JewelTheme.isSwingCompatMode -> pressed
-            isHovered && !JewelTheme.isSwingCompatMode -> hovered
+            isHovered && isFocused && !JewelTheme.isSwingCompatMode -> hovered
+            isHovered && !isFocused && !JewelTheme.isSwingCompatMode -> active
             isFocused -> focused
             isActive -> active
             else -> normal