diff --git a/CHANGELOG.md b/CHANGELOG.md
index 21c8ea5b0..bf00ef8c1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@ All notable changes to this project will be documented in this file.
 - [#1884] Memory search - Exception on sorting by pid
 - [#1006] AS3 - Warning - Function value used where type Boolean was expected
 - AS3 - Resolving types on static protected namespaced properties
+- Hiding selection after raw editation save
 
 ### Changed
 - Quick search needs minimum of 3 characters
diff --git a/src/com/jpexs/decompiler/flash/gui/PreviewPanel.java b/src/com/jpexs/decompiler/flash/gui/PreviewPanel.java
index a417a1fea..07e572f69 100644
--- a/src/com/jpexs/decompiler/flash/gui/PreviewPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/PreviewPanel.java
@@ -1099,11 +1099,11 @@ public class PreviewPanel extends JPersistentSplitPane implements TagEditorPanel
             swf.assignClassesToSymbols();
             swf.assignExportNamesToSymbols();
             mainPanel.refreshTree(swf);
-            mainPanel.setTagTreeSelectedNode(mainPanel.getCurrentTree(), tag);
             genericEditButton.setVisible(true);
             genericSaveButton.setVisible(false);
             genericCancelButton.setVisible(false);
             genericTagPanel.setEditMode(false, null);
+            mainPanel.setTagTreeSelectedNode(mainPanel.getCurrentTree(), tag);            
         }
     }
 
@@ -1124,13 +1124,14 @@ public class PreviewPanel extends JPersistentSplitPane implements TagEditorPanel
             placeImagePanel.freeTransformDepth(-1);
             placeTag.getTimelined().resetTimeline();
         }
+        Tag hilightTag = null;
         if (placeEditMode == PLACE_EDIT_RAW) {
             if (placeGenericPanel.save()) {
                 Tag tag = placeGenericPanel.getTag();
                 SWF swf = tag.getSwf();
                 tag.getTimelined().resetTimeline();
                 mainPanel.refreshTree(swf);
-                mainPanel.setTagTreeSelectedNode(mainPanel.getCurrentTree(), tag);
+                hilightTag = tag;                
             }
             placeGenericPanel.setEditMode(false, null);
         }
@@ -1139,6 +1140,9 @@ public class PreviewPanel extends JPersistentSplitPane implements TagEditorPanel
         placeSaveButton.setVisible(false);
         placeCancelButton.setVisible(false);
         mainPanel.repaintTree();
+        if (hilightTag != null) {
+            mainPanel.setTagTreeSelectedNode(mainPanel.getCurrentTree(), hilightTag);
+        }
     }
 
     private void editPlaceTagButtonActionPerformed(ActionEvent evt) {