diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/ToggleButtonTransition.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/ToggleButtonTransition.java
index 3755975898a8e6a12760d08ac0d15fcf7d258c8f..6ee839dddf70e1a34ac776b9343e068234b391ab 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/ToggleButtonTransition.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/ToggleButtonTransition.java
@@ -20,8 +20,13 @@ public class ToggleButtonTransition extends ToggleButtonSkin {
         fadeOut.setNode(toggleButton);
         fadeOut.setToValue(0.5);
 
-//        toggleButton.setOnMouseEntered(e -> fadeIn.playFromStart());
-//        toggleButton.setOnMouseExited(e -> fadeOut.playFromStart());
+        toggleButton.setOnMouseEntered(e -> fadeIn.playFromStart());
+        toggleButton.setOnMouseExited(e -> {
+            if (!toggleButton.isSelected()) {
+                fadeOut.playFromStart();
+            }
+        });
+
         toggleButton.selectedProperty().addListener((observable, oldValue, newValue) -> {
             if (newValue) {
                 fadeIn.playFromStart();
@@ -34,6 +39,7 @@ public class ToggleButtonTransition extends ToggleButtonSkin {
 
         // Set the initial opacity based on the initial selected state
         toggleButton.setOpacity(toggleButton.isSelected() ? 1.0 : 0.5);
+
     }
 }