diff --git a/Mage.Client/plugins/mage-theme-plugin.jar b/Mage.Client/plugins/mage-theme-plugin.jar
index 2886caeb9b6..385d9fb3a42 100644
Binary files a/Mage.Client/plugins/mage-theme-plugin.jar and b/Mage.Client/plugins/mage-theme-plugin.jar differ
diff --git a/Mage.Client/src/main/java/mage/client/game/BattlefieldPanel.java b/Mage.Client/src/main/java/mage/client/game/BattlefieldPanel.java
index c524fb46ef3..ca8a1c61af6 100644
--- a/Mage.Client/src/main/java/mage/client/game/BattlefieldPanel.java
+++ b/Mage.Client/src/main/java/mage/client/game/BattlefieldPanel.java
@@ -104,15 +104,15 @@ public class BattlefieldPanel extends javax.swing.JLayeredPane implements Compon
 		
 		if (changed) {
 			Plugins.getInstance().sortPermanents(ui, permanents.values());
-		}
-		
-		for (PermanentView permanent: battlefield.values()) {
-			if (permanent.getAttachments() != null) {
-				groupAttachments(permanent);
+			
+			for (PermanentView permanent: battlefield.values()) {
+				if (permanent.getAttachments() != null) {
+					groupAttachments(permanent);
+				}
 			}
+			
+			invalidate();
 		}
-		
-		invalidate();
 	}
 
 	private void addPermanent(PermanentView permanent) {