diff --git a/Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java b/Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java
index a927c6c4e45..da70c0b103e 100644
--- a/Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java
+++ b/Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java
@@ -1163,7 +1163,10 @@ public class CardPanel extends MagePermanent implements MouseListener, MouseMoti
     @Override
     public void componentResized(ComponentEvent ce) {
         doLayout();
-        if (updateCard != null) {
+        // this update removes the isChoosable mark from targetCardsInLibrary
+        // so only done for permanents because it's needed to redraw counters in different size, if window size was changed
+        // no perfect solution yet (maybe also other not wanted effects for PermanentView objects)
+        if (updateCard != null && (updateCard instanceof PermanentView)) {
             update(updateCard);
         }
     }
diff --git a/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java b/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java
index 074d582633c..2425356cfb3 100644
--- a/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java
+++ b/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java
@@ -1249,7 +1249,7 @@ public class ComputerPlayer extends PlayerImpl implements Player {
             return true;
         }
 
-        ArrayList<Card> cardChoices = new ArrayList<Card>(cards.getCards(target.getFilter(), game));
+        ArrayList<Card> cardChoices = new ArrayList<>(cards.getCards(target.getFilter(), game));
         while (!target.doneChosing()) {
             Card card = pickTarget(cardChoices, outcome, target, source, game);
             if (card != null) {