diff --git a/forge-gui-desktop/src/main/java/forge/gui/framework/FScreen.java b/forge-gui-desktop/src/main/java/forge/gui/framework/FScreen.java
index 04c6e7f225c..727443f5066 100644
--- a/forge-gui-desktop/src/main/java/forge/gui/framework/FScreen.java
+++ b/forge-gui-desktop/src/main/java/forge/gui/framework/FScreen.java
@@ -28,7 +28,7 @@ public class FScreen {
     public static final FScreen HOME_SCREEN = new FScreen(
             VHomeUI.SINGLETON_INSTANCE,
             CHomeUI.SINGLETON_INSTANCE,
-            "Home",
+            "Home  ",
             FSkin.getIcon(FSkinProp.ICO_FAVICON),
             false,
             "Exit Forge",
@@ -46,7 +46,7 @@ public class FScreen {
     public static final FScreen DECK_EDITOR_CONSTRUCTED = new FScreen(
             VDeckEditorUI.SINGLETON_INSTANCE,
             CDeckEditorUI.SINGLETON_INSTANCE,
-            "Deck Editor",
+            "Deck Editor   ",
             FSkin.getImage(FSkinProp.IMG_PACK),
             false,
             "Back to Home",
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 4c29cde08c5..16e2eca982d 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
@@ -77,6 +77,7 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
     private Point hoverScrollPos;
     private ItemInfo hoveredItem;
     private ItemInfo focalItem;
+    private boolean panelOptionsCreated = false;
 
     private final List<ItemInfo> orderedItems = new ArrayList<>();
     private final List<Group> groups = new ArrayList<>();
@@ -337,7 +338,12 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
 
     @Override
     public void setup(ItemManagerConfig config, Map<ColumnDef, ItemTableColumn> colOverrides) {
-        setPanelOptions(config.getShowUniqueCardsOption());
+        // if this is the first setup call, panel options will be added to UI components
+        if (!this.panelOptionsCreated){
+            setPanelOptions(config.getShowUniqueCardsOption());
+            this.panelOptionsCreated = true;
+        }
+        // set status of components in the panel
         setGroupBy(config.getGroupBy(), true);
         setPileBy(config.getPileBy(), true);
         setColumnCount(config.getImageColumnCount(), true);