diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d8e58ac8..fcab7c267 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@ All notable changes to this project will be documented in this file.
 - Not resetting timeline after shape tag type conversion
 - [#2400] Transforming - buttons must use hit test frame outline
 - [#2413] AS3 direct editation - try/catch clause in instance initializer
+- [#2386] Editor mode - not able to save shape/morphshape points
 
 ## [22.0.2] - 2025-01-17
 ### Added
@@ -3723,6 +3724,7 @@ Major version of SWF to XML export changed to 2.
 [#2394]: https://www.free-decompiler.com/flash/issues/2394
 [#2400]: https://www.free-decompiler.com/flash/issues/2400
 [#2413]: https://www.free-decompiler.com/flash/issues/2413
+[#2386]: https://www.free-decompiler.com/flash/issues/2386
 [#2375]: https://www.free-decompiler.com/flash/issues/2375
 [#2374]: https://www.free-decompiler.com/flash/issues/2374
 [#2389]: https://www.free-decompiler.com/flash/issues/2389
diff --git a/src/com/jpexs/decompiler/flash/gui/PreviewPanel.java b/src/com/jpexs/decompiler/flash/gui/PreviewPanel.java
index e56c6e8be..25f426bb8 100644
--- a/src/com/jpexs/decompiler/flash/gui/PreviewPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/PreviewPanel.java
@@ -1924,6 +1924,14 @@ public class PreviewPanel extends JPersistentSplitPane implements TagEditorPanel
                 displayEditCancelButton.setEnabled(true);
                 displayEditTransformButton.setVisible(false);
                 mainPanel.setEditingStatus();
+                if (Configuration.editorMode.get()) {
+                    displayEditEditPointsButton.setVisible(false);
+                    displayEditTransformButton.setVisible(false);
+                    replaceShapeButton.setVisible(false);
+                    replaceShapeUpdateBoundsButton.setVisible(false);
+                    replaceMorphShapeButton.setVisible(false);
+                    replaceMorphShapeUpdateBoundsButton.setVisible(false);
+                }
             }
 
             @Override
@@ -2737,6 +2745,9 @@ public class PreviewPanel extends JPersistentSplitPane implements TagEditorPanel
         replaceShapeUpdateBoundsButton.setVisible(false);
         replaceMorphShapeUpdateBoundsButton.setVisible(false);
         displayEditEditPointsButton.setVisible(false);
+        
+        displayEditSaveButton.setEnabled(true);
+        displayEditCancelButton.setEnabled(true);
 
         if ((displayEditTag instanceof MorphShapeTag) && (morphDisplayMode == MORPH_ANIMATE)) {
             displayEditShowStartButton.setSelected(true);