diff --git a/src/com/jpexs/decompiler/flash/gui/tagtree/TagTreeContextMenu.java b/src/com/jpexs/decompiler/flash/gui/tagtree/TagTreeContextMenu.java
index 26ae54d9c..8ec16bbcb 100644
--- a/src/com/jpexs/decompiler/flash/gui/tagtree/TagTreeContextMenu.java
+++ b/src/com/jpexs/decompiler/flash/gui/tagtree/TagTreeContextMenu.java
@@ -1674,6 +1674,10 @@ public class TagTreeContextMenu extends JPopupMenu {
             return;
         }
 
+        TreePath sel = mainPanel.getCurrentTree().getSelectionPath();
+        if (sel == null || sel.getLastPathComponent() != itemr) {
+            mainPanel.setTagTreeSelectedNode(mainPanel.getCurrentTree(), itemr);
+        }
         mainPanel.showGenericTag((Tag) itemr);
     }