diff --git a/gui/griffon-app/controllers/com/muwire/gui/MainFrameController.groovy b/gui/griffon-app/controllers/com/muwire/gui/MainFrameController.groovy
index c3bf200c..e13c07a1 100644
--- a/gui/griffon-app/controllers/com/muwire/gui/MainFrameController.groovy
+++ b/gui/griffon-app/controllers/com/muwire/gui/MainFrameController.groovy
@@ -281,7 +281,7 @@ class MainFrameController {
         def downloader = downloads.get(0)
         def params = [:]
         params['downloader'] = downloader
-        mvcGroup.createMVCGroup("download-preview", params)
+        mvcGroup.createMVCGroup("download-preview", params).destroy()
     }
     
     @ControllerAction
diff --git a/gui/griffon-app/views/com/muwire/gui/DownloadPreviewView.groovy b/gui/griffon-app/views/com/muwire/gui/DownloadPreviewView.groovy
index 733014d9..6a2c6af6 100644
--- a/gui/griffon-app/views/com/muwire/gui/DownloadPreviewView.groovy
+++ b/gui/griffon-app/views/com/muwire/gui/DownloadPreviewView.groovy
@@ -44,12 +44,6 @@ class DownloadPreviewView {
         dialog.setResizable(false)
         dialog.setLocationRelativeTo(mainFrame)
         dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE)
-        dialog.addWindowListener(new WindowAdapter() {
-            public void windowClosed(WindowEvent e) {
-                mainFrame.setVisible(false)
-                mvcGroup.destroy()
-            }
-        })
     }
     
     void mvcGroupInit(Map<String, String> args) {