diff --git a/trunk/src/com/jpexs/asdec/abc/gui/ClassesListTree.java b/trunk/src/com/jpexs/asdec/abc/gui/ClassesListTree.java
index e0a9e344d..48cd43b33 100644
--- a/trunk/src/com/jpexs/asdec/abc/gui/ClassesListTree.java
+++ b/trunk/src/com/jpexs/asdec/abc/gui/ClassesListTree.java
@@ -57,6 +57,7 @@ public class ClassesListTree extends JTree implements TreeSelectionListener {
       setModel(new ClassesListTreeModel(list));
    }
 
+   @Override
    public void valueChanged(TreeSelectionEvent e) {
       if (Main.isWorking()) {
          return;
@@ -83,8 +84,9 @@ public class ClassesListTree extends JTree implements TreeSelectionListener {
                   }
                   Main.abcMainFrame.navigator.setABC(abcList, scriptLeaf.abc);
                   Main.abcMainFrame.navigator.setClassIndex(classIndex);
-                  Main.abcMainFrame.setAbc(scriptLeaf.abc);
+                  Main.abcMainFrame.setAbc(scriptLeaf.abc);                
                   Main.abcMainFrame.decompiledTextArea.setScript(scriptLeaf.abc.script_info[scriptLeaf.scriptIndex], scriptLeaf.abc, abcList);
+                  Main.abcMainFrame.decompiledTextArea.setClassIndex(classIndex);
                   Main.abcMainFrame.detailPanel.methodTraitPanel.methodCodePanel.sourceTextArea.setText("");
                   Main.stopWork();
                }
diff --git a/trunk/src/com/jpexs/asdec/abc/gui/DecompiledEditorPane.java b/trunk/src/com/jpexs/asdec/abc/gui/DecompiledEditorPane.java
index 842734f45..760cbb345 100644
--- a/trunk/src/com/jpexs/asdec/abc/gui/DecompiledEditorPane.java
+++ b/trunk/src/com/jpexs/asdec/abc/gui/DecompiledEditorPane.java
@@ -46,6 +46,12 @@ public class DecompiledEditorPane extends LineMarkedEditorPane implements MouseL
       Main.abcMainFrame.detailPanel.showCard(DetailPanel.UNSUPPORTED_TRAIT_CARD);
    }
 
+   public void setClassIndex(int classIndex) {
+      this.classIndex = classIndex;
+   }
+   
+   
+
    private boolean displayMethod(int pos, int methodIndex) {
       int bi = abc.findBodyIndex(methodIndex);
       if (bi == -1) {
diff --git a/trunk/src/com/jpexs/asdec/abc/gui/DetailPanel.java b/trunk/src/com/jpexs/asdec/abc/gui/DetailPanel.java
index 0fffc7a97..1eb3bc780 100644
--- a/trunk/src/com/jpexs/asdec/abc/gui/DetailPanel.java
+++ b/trunk/src/com/jpexs/asdec/abc/gui/DetailPanel.java
@@ -36,7 +36,7 @@ public class DetailPanel extends JPanel implements ActionListener {
    public JPanel unsupportedTraitPanel;
    public SlotConstTraitDetailPanel slotConstTraitPanel;
    public static final String METHOD_TRAIT_CARD = "Method/Getter/Setter Trait";
-   public static final String UNSUPPORTED_TRAIT_CARD = "Unsupported Trait Type";
+   public static final String UNSUPPORTED_TRAIT_CARD = "-";
    public static final String SLOT_CONST_TRAIT_CARD = "Slot/Const Trait";
    private JPanel innerPanel;
    public JButton saveButton;
@@ -52,7 +52,7 @@ public class DetailPanel extends JPanel implements ActionListener {
       cardMap.put(METHOD_TRAIT_CARD, methodTraitPanel);
 
       unsupportedTraitPanel = new JPanel(new BorderLayout());
-      JLabel unsup = new JLabel("Editing of this trait type is currently unsupported", SwingConstants.CENTER);
+      JLabel unsup = new JLabel("Select class and click a trait in Actionscript source to edit it.", SwingConstants.CENTER);
       unsupportedTraitPanel.add(unsup, BorderLayout.CENTER);
 
       cardMap.put(UNSUPPORTED_TRAIT_CARD, unsupportedTraitPanel);