diff --git a/SwingUtilities/src/main/java/fr/soleil/lib/project/swing/border/FoldableBorder.java b/SwingUtilities/src/main/java/fr/soleil/lib/project/swing/border/FoldableBorder.java
index 4129b4f02b6f5f564e05fa21ff2b2b9459920cdb..e787ffcf6bcd451b8dbc7756c1500770cfeea6fa 100644
--- a/SwingUtilities/src/main/java/fr/soleil/lib/project/swing/border/FoldableBorder.java
+++ b/SwingUtilities/src/main/java/fr/soleil/lib/project/swing/border/FoldableBorder.java
@@ -515,14 +515,14 @@ public class FoldableBorder extends ColoredLineTitledBorder implements MouseList
 
     @Override
     public void mouseClicked(MouseEvent e) {
-        if (isButtonEvent(e)) {
+        if (isButtonEvent(e) && arrowButton.isEnabled()) {
             setFolded(!isFolded());
         }
     }
 
     @Override
     public void mousePressed(MouseEvent e) {
-        if (isButtonEvent(e)) {
+        if (isButtonEvent(e) && arrowButton.isEnabled()) {
             setButtonPressed(true);
         }
     }
@@ -534,7 +534,7 @@ public class FoldableBorder extends ColoredLineTitledBorder implements MouseList
 
     @Override
     public void mouseEntered(MouseEvent e) {
-        if (isButtonEvent(e)) {
+        if (isButtonEvent(e) && arrowButton.isEnabled()) {
             setButtonHover(true);
         }
     }
@@ -547,14 +547,14 @@ public class FoldableBorder extends ColoredLineTitledBorder implements MouseList
 
     @Override
     public void mouseDragged(MouseEvent e) {
-        boolean button = isButtonEvent(e);
+        boolean button = isButtonEvent(e) && arrowButton.isEnabled();
         setButtonPressed(button);
         setButtonHover(button);
     }
 
     @Override
     public void mouseMoved(MouseEvent e) {
-        boolean button = isButtonEvent(e);
+        boolean button = isButtonEvent(e) && arrowButton.isEnabled();
         setButtonHover(button);
     }