diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/ItemManager.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/ItemManager.java index d44cb486734..00ac426c719 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/ItemManager.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/ItemManager.java @@ -1042,8 +1042,6 @@ public abstract class ItemManager extends JPanel { } public void showContextMenu(MouseEvent e) { - if (this.contextMenuBuilder == null) { return; } - //ensure the item manager has focus this.focus(); @@ -1060,6 +1058,8 @@ public abstract class ItemManager extends JPanel { this.setSelectedIndex(index); } + if (this.contextMenuBuilder == null) { return; } + JPopupMenu menu = new JPopupMenu("ItemManagerContextMenu"); this.contextMenuBuilder.buildContextMenu(menu);