3 files changed, 3 insertions, 2 deletions

diff --git a/src/main/java/cuchaz/enigma/Deobfuscator.java b/src/main/java/cuchaz/enigma/Deobfuscator.java
index 32792c6b..4d9e6556 100644
--- a/src/main/java/cuchaz/enigma/Deobfuscator.java
+++ b/src/main/java/cuchaz/enigma/Deobfuscator.java
@@ -411,7 +411,7 @@ public class Deobfuscator {
             }
 
             // FIXME: HACK EVEN MORE HACK!
-            if (hack)
+            if (hack && this.jarIndex.containsObfEntry(obfEntry.getClassEntry()))
                 return true;
         }
 
diff --git a/src/main/java/cuchaz/enigma/gui/Gui.java b/src/main/java/cuchaz/enigma/gui/Gui.java
index 846e35b5..80cb3edf 100644
--- a/src/main/java/cuchaz/enigma/gui/Gui.java
+++ b/src/main/java/cuchaz/enigma/gui/Gui.java
@@ -738,7 +738,7 @@ public class Gui {
                         throw new Error(ex);
                     }
                 }
-                else
+                else if (response == JOptionPane.NO_OPTION)
                     this.frame.dispose();
 
                 return null;
diff --git a/src/main/java/cuchaz/enigma/gui/panels/PanelEditor.java b/src/main/java/cuchaz/enigma/gui/panels/PanelEditor.java
index 8bf4ed66..6eff81c5 100644
--- a/src/main/java/cuchaz/enigma/gui/panels/PanelEditor.java
+++ b/src/main/java/cuchaz/enigma/gui/panels/PanelEditor.java
@@ -52,6 +52,7 @@ public class PanelEditor extends JEditorPane {
                         break;
                     case KeyEvent.VK_F5:
                         gui.getController().refreshCurrentClass();
+                        break;
                     default:
                         break;
                 }