diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/views/ImageView.java b/forge-gui-desktop/src/main/java/forge/itemmanager/views/ImageView.java
index b287382410d..3bcb44ce85f 100644
--- a/forge-gui-desktop/src/main/java/forge/itemmanager/views/ImageView.java
+++ b/forge-gui-desktop/src/main/java/forge/itemmanager/views/ImageView.java
@@ -572,17 +572,19 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
             }
 
             groupY = y;
+
+            if (group.items.isEmpty()) {
+                group.setBounds(groupX, groupY, groupWidth, 0);
+                continue;
+            }
+
             if (groupBy != null) {
                 y += GROUP_HEADER_HEIGHT + PADDING; //leave room for group header
-                if (group.isCollapsed || group.items.isEmpty()) {
+                if (group.isCollapsed) {
                     group.setBounds(groupX, groupY, groupWidth, GROUP_HEADER_HEIGHT);
                     continue;
                 }
             }
-            else if (group.items.isEmpty()) {
-                group.setBounds(groupX, groupY, groupWidth, 0);
-                continue;
-            }
 
             if (pileBy == null) {
                 //if not piling by anything, wrap items using a pile for each row
diff --git a/forge-gui-mobile/src/forge/itemmanager/views/ImageView.java b/forge-gui-mobile/src/forge/itemmanager/views/ImageView.java
index 502004e1bff..8005b1fff50 100644
--- a/forge-gui-mobile/src/forge/itemmanager/views/ImageView.java
+++ b/forge-gui-mobile/src/forge/itemmanager/views/ImageView.java
@@ -450,19 +450,21 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
             }
 
             groupY = y;
+
+            if (group.items.isEmpty()) {
+                group.setBounds(groupX, groupY, groupWidth, 0);
+                group.scrollWidth = groupWidth;
+                continue;
+            }
+
             if (groupBy != null) {
                 y += GROUP_HEADER_HEIGHT + PADDING; //leave room for group header
-                if (group.isCollapsed || group.items.isEmpty()) {
+                if (group.isCollapsed) {
                     group.setBounds(groupX, groupY, groupWidth, GROUP_HEADER_HEIGHT);
                     group.scrollWidth = groupWidth;
                     continue;
                 }
             }
-            else if (group.items.isEmpty()) {
-                group.setBounds(groupX, groupY, groupWidth, 0);
-                group.scrollWidth = groupWidth;
-                continue;
-            }
 
             if (pileBy == null) {
                 //if not piling by anything, wrap items using a pile for each row