diff --git a/gui/griffon-app/views/com/muwire/gui/OptionsView.groovy b/gui/griffon-app/views/com/muwire/gui/OptionsView.groovy
index 7193c6fe..a6cb3bb4 100644
--- a/gui/griffon-app/views/com/muwire/gui/OptionsView.groovy
+++ b/gui/griffon-app/views/com/muwire/gui/OptionsView.groovy
@@ -6,6 +6,10 @@ import griffon.metadata.ArtifactProviderFor
 
 import javax.swing.JDialog
 import javax.swing.SwingConstants
+
+import java.awt.event.WindowAdapter
+import java.awt.event.WindowEvent
+
 import javax.annotation.Nonnull
 
 @ArtifactProviderFor(GriffonView)
@@ -39,6 +43,12 @@ class OptionsView {
         d.getContentPane().add(p)
         d.pack()
         d.setLocationRelativeTo(mainFrame)
+        d.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE)
+        d.addWindowListener(new WindowAdapter() {
+            public void windowClosed(WindowEvent e) {
+                mvcGroup.destroy()
+            }
+        })
         d.show()
     }
 }
\ No newline at end of file