diff --git a/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/masterpassword/gui/PasswordFrame.java b/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/masterpassword/gui/PasswordFrame.java
index 95f8f137..0a484a93 100644
--- a/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/masterpassword/gui/PasswordFrame.java
+++ b/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/masterpassword/gui/PasswordFrame.java
@@ -41,6 +41,7 @@ public class PasswordFrame extends JFrame implements DocumentListener {
 
         JLabel label;
 
+        setDefaultCloseOperation( DISPOSE_ON_CLOSE );
         setContentPane( new JPanel( new BorderLayout( 20, 20 ) ) {
             {
                 setBorder( new EmptyBorder( 20, 20, 20, 20 ) );
diff --git a/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/masterpassword/gui/Res.java b/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/masterpassword/gui/Res.java
index 363797c5..154834b3 100644
--- a/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/masterpassword/gui/Res.java
+++ b/MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/masterpassword/gui/Res.java
@@ -73,7 +73,7 @@ public abstract class Res {
 
             host.addWindowListener( new WindowAdapter() {
                 @Override
-                public void windowClosing(final WindowEvent e) {
+                public void windowClosed(final WindowEvent e) {
                     ExecutorService executor = executorByWindow.remove( host );
                     if (executor != null)
                         executor.shutdownNow();