diff --git a/Java/ovalButton/OvalButton.java b/Java/ovalButton/OvalButton.java
index 5ca0f3c..cc5ce17 100755
--- a/Java/ovalButton/OvalButton.java
+++ b/Java/ovalButton/OvalButton.java
@@ -524,6 +524,7 @@ public void mouseReleased(MouseEvent e) {
     public void mouseEntered(MouseEvent e) {
         if (isValidClickPosition(e.getLocationOnScreen())) {
             currentBackground = colorHighlighted;
+            setHighlightedBorder(true);
         }
         repaint();
     }
@@ -531,6 +532,7 @@ public void mouseEntered(MouseEvent e) {
     @Override
     public void mouseExited(MouseEvent e) {
         currentBackground = colorNormal;
+            setHighlightedBorder(false);
         repaint();
     }
 
@@ -538,9 +540,11 @@ public void mouseExited(MouseEvent e) {
     public void mouseMoved(MouseEvent e) {
         if (isValidClickPosition(e.getLocationOnScreen())) {
             currentBackground = colorHighlighted;
+            setHighlightedBorder(true);
         }
         else {
             currentBackground = colorNormal;
+            setHighlightedBorder(false);
         }
         repaint();
     }