diff --git a/kiwixapp.cpp b/kiwixapp.cpp
index 2ad9107..1696f61 100644
--- a/kiwixapp.cpp
+++ b/kiwixapp.cpp
@@ -5,10 +5,14 @@ KiwixApp::KiwixApp(int& argc, char *argv[])
     : QApplication(argc, argv),
       reader(nullptr)
 {
+    mainWindow = new MainWindow;
+    setApplicationName("kiwix-desktop");
+    mainWindow->show();
 }
 
 KiwixApp::~KiwixApp()
 {
+    delete mainWindow;
     if (reader)
         delete reader;
 }
diff --git a/kiwixapp.h b/kiwixapp.h
index 36c66d3..fb368f5 100644
--- a/kiwixapp.h
+++ b/kiwixapp.h
@@ -6,6 +6,7 @@
 
 #include <QApplication>
 #include <kiwix/reader.h>
+#include "mainwindow.h"
 
 
 class KiwixApp : public QApplication
@@ -20,6 +21,7 @@ public:
 
 private:
     kiwix::Reader* reader;
+    MainWindow* mainWindow;
 };
 
 #endif // KIWIXAPP_H
diff --git a/main.cpp b/main.cpp
index ff11452..344cfb4 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,5 +1,4 @@
 #include "kiwixapp.h"
-#include "mainwindow.h"
 
 #include <QCommandLineParser>
 #include <QFileDialog>
@@ -8,7 +7,6 @@
 int main(int argc, char *argv[])
 {
     KiwixApp a(argc, argv);
-    KiwixApp::setApplicationName("kiwix-desktop");
 
     QCommandLineParser parser;
     parser.addPositionalArgument("zimfile", "The zim file");
@@ -27,8 +25,6 @@ int main(int argc, char *argv[])
     std::string f = zimfile.toUtf8().constData();
     std::cout << f << std::endl;
 
-    MainWindow w;
-    w.show();
     a.openZimFile(zimfile);
 
     return a.exec();