diff --git a/src/main/java/views/MainPanel.java b/src/main/java/views/MainPanel.java
index c7cc1f0..93fc672 100644
--- a/src/main/java/views/MainPanel.java
+++ b/src/main/java/views/MainPanel.java
@@ -181,14 +181,16 @@
                 @Override
                 public void actionPerformed(ActionEvent e) {
                     if(!iAttack.isDeckLess())return;//デッキがあるときは何も反応しないように
-
+                    for(var my:myHandButtons)my.setEnabledSelection(false);
                     cardButton.setEnabledSelection(true);
                     var option = JOptionPane.showConfirmDialog(null, "Attack with This Card?", "confirmation", 2);
 
-                    cardButton.setEnabledSelection(false);
+
                     if (option == JOptionPane.YES_OPTION){
                         attacker=a;
                         isDecidedAttacker=true;
+                    }else {
+                        cardButton.setEnabledSelection(false);
                     }
                 }
             });
@@ -252,6 +254,7 @@
                         cardButton.setEnabledSelection(false);
                         return;
                     }
+                    for(var my:myHandButtons)my.setEnabledSelection(false);
                     cardButton.setEnabledSelection(false);
                     repaintField(iAttack);
                     if(isGameOver(iAttack)){