diff --git a/MultiMC.cpp b/MultiMC.cpp
index 25c53185..3d62f76e 100644
--- a/MultiMC.cpp
+++ b/MultiMC.cpp
@@ -37,6 +37,9 @@ MultiMC::MultiMC(int &argc, char **argv) : QApplication(argc, argv)
 
 	initTranslations();
 
+	// Don't quit on hiding the last window
+	this->setQuitOnLastWindowClosed(false);
+
 	// Print app header
 	std::cout << "MultiMC 5" << std::endl;
 	std::cout << "(c) 2013 MultiMC Contributors" << std::endl << std::endl;
@@ -158,6 +161,7 @@ MultiMC::MultiMC(int &argc, char **argv) : QApplication(argc, argv)
 			m_status = MultiMC::Failed;
 		return;
 	}
+
 	m_status = MultiMC::Initialized;
 }
 
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index ff1ac68a..46fd5bd7 100644
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -444,6 +444,7 @@ void MainWindow::closeEvent(QCloseEvent *event)
 	//	settings->getConfig().setValue("MainWindowGeometry", saveGeometry());
 	//	settings->getConfig().setValue("MainWindowState", saveState());
 	QMainWindow::closeEvent(event);
+	QApplication::exit();
 }
 /*
 void MainWindow::on_instanceView_customContextMenuRequested(const QPoint &pos)