diff --git a/embedding/browser/qt/tests/mainwindow.cpp b/embedding/browser/qt/tests/mainwindow.cpp
index d4a6ab478be..af075cf68fd 100644
--- a/embedding/browser/qt/tests/mainwindow.cpp
+++ b/embedding/browser/qt/tests/mainwindow.cpp
@@ -7,6 +7,7 @@
 #include <qfiledialog.h>
 #include <qstatusbar.h>
 #include <qlayout.h>
+#include <qapplication.h>
 
 #include "qgeckoembed.h"
 
@@ -76,6 +77,13 @@ MyMainWindow::MyMainWindow()
 
     connect( location, SIGNAL(returnPressed()), SLOT(changeLocation()));
 
+    connect( qApp, SIGNAL(lastWindowClosed()), SLOT(mainQuit()));
+}
+
+void MyMainWindow::mainQuit()
+{
+    delete qecko;
+    qecko = NULL;
 }
 
 void MyMainWindow::fileOpen()
diff --git a/embedding/browser/qt/tests/mainwindow.h b/embedding/browser/qt/tests/mainwindow.h
index 4b9a5b3582f..54aa68aa3cb 100644
--- a/embedding/browser/qt/tests/mainwindow.h
+++ b/embedding/browser/qt/tests/mainwindow.h
@@ -19,6 +19,7 @@ public slots:
     void goBack();
     void goForward();
     void stop();
+    void mainQuit();
 
 public:
     QGeckoEmbed *qecko;