2 files changed, 6 insertions, 7 deletions

diff --git a/src/main/java/cuchaz/enigma/gui/Gui.java b/src/main/java/cuchaz/enigma/gui/Gui.java
index 0ccb3f7..a81ad06 100644
--- a/src/main/java/cuchaz/enigma/gui/Gui.java
+++ b/src/main/java/cuchaz/enigma/gui/Gui.java
@@ -574,8 +574,7 @@ public class Gui {
 
         int offset = text.getText().lastIndexOf('/') + 1;
         // If it's a class and isn't in the default package, assume that it's deobfuscated.
-        if (m_reference.getNameableEntry() instanceof ClassEntry && !text.getText().startsWith(Constants.NONE_PACKAGE)
-                && offset != 0)
+        if (m_reference.getNameableEntry() instanceof ClassEntry && text.getText().contains("/") && offset != 0)
             text.select(offset, text.getText().length());
         else
             text.selectAll();
@@ -778,9 +777,8 @@ public class Gui {
     {
         String oldEntry = deobfReference.entry.getClassEntry().getPackageName();
         String newEntry = new ClassEntry(Descriptor.toJvmName(newName)).getPackageName();
-        if (oldEntry != null && newEntry != null)
-            moveClassTree(deobfReference, newName, oldEntry.equals(Constants.NONE_PACKAGE),
-                    newEntry.equals(Constants.NONE_PACKAGE));
+        moveClassTree(deobfReference, newName, oldEntry == null,
+                newEntry == null);
     }
 
     public void moveClassTree(EntryReference<Entry, Entry> deobfReference, String newName, boolean isOldOb, boolean isNewOb)
diff --git a/src/main/java/cuchaz/enigma/gui/node/ClassSelectorPackageNode.java b/src/main/java/cuchaz/enigma/gui/node/ClassSelectorPackageNode.java
index d2e421e..30d8a9c 100644
--- a/src/main/java/cuchaz/enigma/gui/node/ClassSelectorPackageNode.java
+++ b/src/main/java/cuchaz/enigma/gui/node/ClassSelectorPackageNode.java
@@ -10,6 +10,7 @@
  ******************************************************************************/
 package cuchaz.enigma.gui.node;
 
+import com.strobel.annotations.Nullable;
 import javassist.bytecode.Descriptor;
 
 import javax.swing.tree.DefaultMutableTreeNode;
@@ -18,8 +19,8 @@ public class ClassSelectorPackageNode extends DefaultMutableTreeNode {
 
     private String packageName;
 
-    public ClassSelectorPackageNode(String packageName) {
-        this.packageName = packageName;
+    public ClassSelectorPackageNode(@Nullable String packageName) {
+        this.packageName = packageName != null ? packageName : "(none)";
     }
 
     public String getPackageName() {