diff --git a/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java b/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
index 6b2f693c3..ffdaac248 100644
--- a/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
@@ -1015,15 +1015,23 @@ public class ABCPanel extends JPanel implements ItemListener, SearchListener<Scr
         editDecompiledButton.addActionListener(this::editDecompiledButtonActionPerformed);
         cancelDecompiledButton.addActionListener(this::cancelDecompiledButtonActionPerformed);
 
-        saveDecompiledButton.setVisible(false);
-        cancelDecompiledButton.setVisible(false);
+        /*if (Configuration.editorMode.get()) {
+            editDecompiledButton.setVisible(false);
+            saveDecompiledButton.setEnabled(false);
+            cancelDecompiledButton.setEnabled(false);
+        } else 
+        */
+        {
+            saveDecompiledButton.setVisible(false);
+            cancelDecompiledButton.setVisible(false);
+        }
         decButtonsPan.setAlignmentX(0);
 
         JPanel decPanel = new JPanel(new BorderLayout());
         decPanel.add(searchPanel, BorderLayout.NORTH);
         decPanel.add(iconDecPanel, BorderLayout.CENTER);
         decPanel.add(decButtonsPan, BorderLayout.SOUTH);
-        detailPanel = new DetailPanel(this);
+        detailPanel = new DetailPanel(this, mainPanel);
         JPanel panB = new JPanel();
         panB.setLayout(new BorderLayout());
         panB.add(decLabel, BorderLayout.NORTH);
@@ -1512,12 +1520,24 @@ public class ABCPanel extends JPanel implements ItemListener, SearchListener<Scr
             decompiledTextArea.setText(lastDecompiled);
         }
 
-        decompiledTextArea.setEditable(val);
-        saveDecompiledButton.setVisible(val);
-        saveDecompiledButton.setEnabled(false);
-        editDecompiledButton.setVisible(!val);
-        experimentalLabel.setVisible(!val);
-        cancelDecompiledButton.setVisible(val);
+        /*if (Configuration.editorMode.get()) {
+            decompiledTextArea.setEditable(true);
+            editDecompiledButton.setVisible(false);
+            saveDecompiledButton.setVisible(true);
+            saveDecompiledButton.setEnabled(false);
+            cancelDecompiledButton.setVisible(true);
+            cancelDecompiledButton.setEnabled(false);
+            experimentalLabel.setVisible(false);
+        } else*/
+        {
+            decompiledTextArea.setEditable(val);
+            saveDecompiledButton.setVisible(val);
+            saveDecompiledButton.setEnabled(false);
+            editDecompiledButton.setVisible(!val);
+            experimentalLabel.setVisible(!val);                
+            cancelDecompiledButton.setVisible(val);
+        }
+        
         decompiledTextArea.getCaret().setVisible(true);
         decLabel.setIcon(val ? View.getIcon("editing16") : null);
         detailPanel.setVisible(!val);
@@ -1538,6 +1558,7 @@ public class ABCPanel extends JPanel implements ItemListener, SearchListener<Scr
         if (ViewMessages.showConfirmDialog(this, AppStrings.translate("message.confirm.experimental.function"), AppStrings.translate("message.warning"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE, Configuration.warningExperimentalAS3Edit, JOptionPane.OK_OPTION) == JOptionPane.OK_OPTION) {
             pack = decompiledTextArea.getScriptLeaf();
             setDecompiledEditMode(true);
+            mainPanel.setEditingStatus();
             SwingWorker initReplaceWorker = new SwingWorker() {
                 @Override
                 protected Object doInBackground() throws Exception {
@@ -1554,6 +1575,7 @@ public class ABCPanel extends JPanel implements ItemListener, SearchListener<Scr
         if (scriptReplacer != null) {
             scriptReplacer.deinitReplacement(pack);
         }
+        mainPanel.clearEditingStatus();
     }
 
     public TreeItem getScriptNodeForPack(ScriptPack pack) {
@@ -1586,6 +1608,7 @@ public class ABCPanel extends JPanel implements ItemListener, SearchListener<Scr
                 hilightScript(localAbc.getOpenable(), oldSp, scriptNode);
             }
             reload();
+            mainPanel.clearEditingStatus();
             ViewMessages.showMessageDialog(this, AppStrings.translate("message.action.saved"), AppStrings.translate("dialog.message.title"), JOptionPane.INFORMATION_MESSAGE, Configuration.showCodeSavedMessage);
         } catch (As3ScriptReplaceException asre) {
             StringBuilder sb = new StringBuilder();
@@ -1821,7 +1844,8 @@ public class ABCPanel extends JPanel implements ItemListener, SearchListener<Scr
     public boolean isEditing() {
         View.checkAccess();
 
-        return detailPanel.saveButton.isVisible() || saveDecompiledButton.isVisible();
+        return (detailPanel.saveButton.isVisible() && detailPanel.saveButton.isEnabled()) 
+                || (saveDecompiledButton.isVisible() && saveDecompiledButton.isEnabled());
     }
 
     public DebugPanel getDebugPanel() {
diff --git a/src/com/jpexs/decompiler/flash/gui/abc/DetailPanel.java b/src/com/jpexs/decompiler/flash/gui/abc/DetailPanel.java
index 50d9e2c64..8d94c1efa 100644
--- a/src/com/jpexs/decompiler/flash/gui/abc/DetailPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/abc/DetailPanel.java
@@ -24,6 +24,7 @@ import com.jpexs.decompiler.flash.gui.AppStrings;
 import com.jpexs.decompiler.flash.gui.DebuggerHandler;
 import com.jpexs.decompiler.flash.gui.HeaderLabel;
 import com.jpexs.decompiler.flash.gui.Main;
+import com.jpexs.decompiler.flash.gui.MainPanel;
 import com.jpexs.decompiler.flash.gui.TagEditorPanel;
 import com.jpexs.decompiler.flash.gui.View;
 import com.jpexs.decompiler.flash.gui.ViewMessages;
@@ -86,9 +87,12 @@ public class DetailPanel extends JPanel implements TagEditorPanel {
     private boolean buttonsShouldBeShown = false;
 
     private final DebuggerHandler.ConnectionListener conListener;
+    
+    private MainPanel mainPanel;
 
-    public DetailPanel(ABCPanel abcPanel) {
+    public DetailPanel(ABCPanel abcPanel, MainPanel mainPanel) {
         this.abcPanel = abcPanel;
+        this.mainPanel = mainPanel;
         innerPanel = new JPanel();
         CardLayout layout = new CardLayout();
         innerPanel.setLayout(layout);
@@ -120,8 +124,15 @@ public class DetailPanel extends JPanel implements TagEditorPanel {
         saveButton.addActionListener(this::saveButtonActionPerformed);
         editButton.addActionListener(this::editButtonActionPerformed);
         cancelButton.addActionListener(this::cancelButtonActionPerformed);
-        saveButton.setVisible(false);
-        cancelButton.setVisible(false);
+        /*if (Configuration.editorMode.get()) {
+            editButton.setVisible(false);
+            saveButton.setEnabled(false);
+            cancelButton.setEnabled(false);
+        } else */
+        {
+            saveButton.setVisible(false);
+            cancelButton.setVisible(false);
+        }
         buttonsPanel.setBorder(new BevelBorder(BevelBorder.RAISED));
         buttonsPanel.add(editButton);
         buttonsPanel.add(saveButton);
@@ -186,13 +197,26 @@ public class DetailPanel extends JPanel implements TagEditorPanel {
     }
 
     public void setEditMode(boolean val) {
-        slotConstTraitPanel.setEditMode(val);
-        methodTraitPanel.setEditMode(val);
-        saveButton.setVisible(val);
-        saveButton.setEnabled(false);
-        editButton.setVisible(!val);
-        cancelButton.setVisible(val);
-        selectedLabel.setIcon(val ? View.getIcon("editing16") : null);
+        /*if (Configuration.editorMode.get()) {
+            slotConstTraitPanel.setEditMode(true);
+            methodTraitPanel.setEditMode(true);
+            editButton.setVisible(false);
+            saveButton.setVisible(true);
+            saveButton.setEnabled(false);
+            cancelButton.setVisible(true);
+            cancelButton.setEnabled(false);
+            selectedLabel.setIcon(View.getIcon("editing16"));            
+        } else 
+*/      
+        {
+            slotConstTraitPanel.setEditMode(val);
+            methodTraitPanel.setEditMode(val);
+            saveButton.setVisible(val);
+            saveButton.setEnabled(false);
+            editButton.setVisible(!val);
+            cancelButton.setVisible(val);
+            selectedLabel.setIcon(val ? View.getIcon("editing16") : null);
+        }
     }
 
     public void showCard(final String name, final Trait trait, int traitIndex, ABC abc) {
@@ -303,6 +327,7 @@ public class DetailPanel extends JPanel implements TagEditorPanel {
     private void cancelButtonActionPerformed(ActionEvent evt) {
         setEditMode(false);
         abcPanel.decompiledTextArea.resetEditing();
+        mainPanel.clearEditingStatus();
     }
 
     private void saveButtonActionPerformed(ActionEvent evt) {
@@ -321,12 +346,13 @@ public class DetailPanel extends JPanel implements TagEditorPanel {
                             decompiledTextArea.gotoTrait(lastTrait);
                         }
                         setEditMode(false);
+                        mainPanel.clearEditingStatus();
                         ViewMessages.showMessageDialog(DetailPanel.this, AppStrings.translate("message.trait.saved"), AppStrings.translate("dialog.message.title"), JOptionPane.INFORMATION_MESSAGE, Configuration.showTraitSavedMessage);
                     }
                 };
 
                 decompiledTextArea.addScriptListener(reloadComplete);
-                decompiledTextArea.reloadClass();
+                decompiledTextArea.reloadClass();                
             }
         }
     }
diff --git a/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java b/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java
index 0391d753e..c202dbc8d 100644
--- a/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java
@@ -765,14 +765,26 @@ public class ActionPanel extends JPanel implements SearchListener<ScriptSearchRe
         saveButton.addActionListener(this::saveActionButtonActionPerformed);
         editButton.addActionListener(this::editActionButtonActionPerformed);
         cancelButton.addActionListener(this::cancelActionButtonActionPerformed);
-        saveButton.setVisible(false);
-        cancelButton.setVisible(false);
+        if (Configuration.editorMode.get()) {
+            editButton.setVisible(false);
+            saveButton.setEnabled(false);
+            cancelButton.setEnabled(false);
+        } else {
+            saveButton.setVisible(false);
+            cancelButton.setVisible(false);
+        }
 
         saveDecompiledButton.addActionListener(this::saveDecompiledButtonActionPerformed);
         editDecompiledButton.addActionListener(this::editDecompiledButtonActionPerformed);
         cancelDecompiledButton.addActionListener(this::cancelDecompiledButtonActionPerformed);
-        saveDecompiledButton.setVisible(false);
-        cancelDecompiledButton.setVisible(false);
+        if (Configuration.editorMode.get()) {
+            editDecompiledButton.setVisible(false);
+            saveDecompiledButton.setEnabled(false);
+            cancelDecompiledButton.setEnabled(false);
+        } else {
+            saveDecompiledButton.setVisible(false);
+            cancelDecompiledButton.setVisible(false);
+        }
 
         JPanel panA = new JPanel(new BorderLayout());
 
@@ -901,9 +913,11 @@ public class ActionPanel extends JPanel implements SearchListener<ScriptSearchRe
         return saveButton.isVisible() && saveButton.isEnabled();
     }
 
-    private void setModified(boolean value) {
+    private void setModified(boolean value) {        
         View.checkAccess();
 
+        editMode = true;
+        mainPanel.setEditingStatus();
         saveButton.setEnabled(value);
         cancelButton.setEnabled(value);
     }
@@ -917,6 +931,8 @@ public class ActionPanel extends JPanel implements SearchListener<ScriptSearchRe
     private void setDecompiledModified(boolean value) {
         View.checkAccess();
 
+        editDecompiledMode = true;
+        mainPanel.setEditingStatus();
         saveDecompiledButton.setEnabled(value);
         cancelDecompiledButton.setEnabled(value);
     }
@@ -934,11 +950,20 @@ public class ActionPanel extends JPanel implements SearchListener<ScriptSearchRe
             }
         }
 
-        editor.setEditable(val);
-        saveButton.setVisible(val);
-        saveButton.setEnabled(false);
-        editButton.setVisible(!val);
-        cancelButton.setVisible(val);
+        if (Configuration.editorMode.get()) {
+            editor.setEditable(true);
+            editButton.setVisible(false);
+            saveButton.setVisible(true);
+            saveButton.setEnabled(false);            
+            cancelButton.setVisible(true);
+            cancelButton.setEnabled(false);
+        } else {        
+            editor.setEditable(val);                
+            saveButton.setVisible(val);
+            saveButton.setEnabled(false);
+            editButton.setVisible(!val);
+            cancelButton.setVisible(val);
+        }
 
         editor.getCaret().setVisible(true);
         asmLabel.setIcon(val ? View.getIcon("editing16") : null); // this line is not working
@@ -960,12 +985,20 @@ public class ActionPanel extends JPanel implements SearchListener<ScriptSearchRe
             }
         }
 
-        decompiledEditor.setEditable(val);
-        saveDecompiledButton.setVisible(val);
-        saveDecompiledButton.setEnabled(false);
-        editDecompiledButton.setVisible(!val);
-        cancelDecompiledButton.setVisible(val);
-
+        if (Configuration.editorMode.get()) {
+            decompiledEditor.setEditable(true);
+            editDecompiledButton.setVisible(false);
+            saveDecompiledButton.setVisible(true);
+            saveDecompiledButton.setEnabled(false);
+            cancelDecompiledButton.setVisible(true);
+            cancelDecompiledButton.setEnabled(false);
+        } else {
+            decompiledEditor.setEditable(val);
+            saveDecompiledButton.setVisible(val);
+            saveDecompiledButton.setEnabled(false);
+            editDecompiledButton.setVisible(!val);
+            cancelDecompiledButton.setVisible(val);
+        }
         decompiledEditor.getCaret().setVisible(true);
         decLabel.setIcon(val ? View.getIcon("editing16") : null);
         editDecompiledMode = val;
@@ -988,6 +1021,7 @@ public class ActionPanel extends JPanel implements SearchListener<ScriptSearchRe
 
     private void editActionButtonActionPerformed(ActionEvent evt) {
         setEditMode(true);
+        mainPanel.setEditingStatus();
     }
 
     private void hexButtonActionPerformed(ActionEvent evt) {
@@ -1031,6 +1065,7 @@ public class ActionPanel extends JPanel implements SearchListener<ScriptSearchRe
     private void cancelActionButtonActionPerformed(ActionEvent evt) {
         setEditMode(false);
         setHex(getExportMode(), src.getScriptName(), lastCode);
+        mainPanel.clearEditingStatus();
     }
 
     private void saveActionButtonActionPerformed(ActionEvent evt) {
@@ -1059,6 +1094,7 @@ public class ActionPanel extends JPanel implements SearchListener<ScriptSearchRe
             editButton.setVisible(true);
             editor.setEditable(false);
             editMode = false;
+            mainPanel.clearEditingStatus();
             mainPanel.refreshTree(src.getSwf());
         } catch (IOException ex) {
         } catch (ActionParseException ex) {
@@ -1072,10 +1108,12 @@ public class ActionPanel extends JPanel implements SearchListener<ScriptSearchRe
 
     private void editDecompiledButtonActionPerformed(ActionEvent evt) {
         setDecompiledEditMode(true);
+        mainPanel.setEditingStatus();
     }
 
     private void cancelDecompiledButtonActionPerformed(ActionEvent evt) {
         setDecompiledEditMode(false);
+        mainPanel.clearEditingStatus();
     }
 
     private void saveDecompiledButtonActionPerformed(ActionEvent evt) {
@@ -1088,6 +1126,7 @@ public class ActionPanel extends JPanel implements SearchListener<ScriptSearchRe
 
             ViewMessages.showMessageDialog(this, AppStrings.translate("message.action.saved"), AppStrings.translate("dialog.message.title"), JOptionPane.INFORMATION_MESSAGE, Configuration.showCodeSavedMessage);
             setDecompiledEditMode(false);
+            mainPanel.clearEditingStatus();
         } catch (ValueTooLargeException ex) {
             ViewMessages.showMessageDialog(this, AppStrings.translate("error.action.save.valueTooLarge"), AppStrings.translate("error"), JOptionPane.ERROR_MESSAGE);
         } catch (IOException ex) {