diff --git a/src/nostalgia/studio/main.cpp b/src/nostalgia/studio/main.cpp
index a8b82c28..41ba126e 100644
--- a/src/nostalgia/studio/main.cpp
+++ b/src/nostalgia/studio/main.cpp
@@ -27,6 +27,7 @@ int run(int argc, char **args) {
 	MainWindow w(argProfilePath);
 	app.setApplicationName(w.windowTitle());
 	w.show();
+	QObject::connect(&app, SIGNAL(aboutToQuit()), &w, SLOT(onExit()));
 
 	return app.exec();
 }
diff --git a/src/nostalgia/studio/mainwindow.cpp b/src/nostalgia/studio/mainwindow.cpp
index e855dd9a..324b5351 100644
--- a/src/nostalgia/studio/mainwindow.cpp
+++ b/src/nostalgia/studio/mainwindow.cpp
@@ -17,6 +17,7 @@
 #include <QLineEdit>
 #include <QMenuBar>
 #include <QPluginLoader>
+#include <QSettings>
 #include <QTextStream>
 #include <QVector>
 
@@ -58,6 +59,7 @@ MainWindow::MainWindow(QString profilePath) {
 
 	setupMenu();
 	setupProjectExplorer();
+	statusBar(); // setup status bar
 
 	loadPlugins(profile);
 
@@ -143,6 +145,7 @@ void MainWindow::setupProjectExplorer() {
 	// setup dock
 	auto dock = new QDockWidget(tr("Project"), this);
 	dock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
+	dock->setObjectName("Project Explorer");
 	addDockWidget(Qt::LeftDockWidgetArea, dock);
 	resizeDocks({dock}, {(int) (width() * 0.25)}, Qt::Horizontal);
 
@@ -194,6 +197,13 @@ QAction *MainWindow::addAction(QMenu *menu, QString text, QString toolTip,
 
 int MainWindow::readState(QString path) {
 	int err = 0;
+
+	QSettings settings("Drinking Tea", "nostalgia-studio");
+	settings.beginGroup("MainWindow");
+	restoreGeometry(settings.value("geometry").toByteArray());
+	restoreState(settings.value("windowState").toByteArray());
+	settings.endGroup();
+
 	QString json;
 	QFile file(path);
 	err |= !file.open(QIODevice::ReadOnly);
@@ -206,6 +216,13 @@ int MainWindow::readState(QString path) {
 
 int MainWindow::writeState(QString path) {
 	int err = 0;
+
+	QSettings settings("Drinking Tea", "nostalgia-studio");
+	settings.beginGroup("MainWindow");
+	settings.setValue("geometry", saveGeometry());
+	settings.setValue("windowState", saveState());
+	settings.endGroup();
+
 	QString json;
 	err |= writeJson(&json, &m_state);
 	QFile file(path);
@@ -256,6 +273,10 @@ int MainWindow::closeProject() {
 	return err;
 }
 
+void MainWindow::onExit() {
+	writeState();
+}
+
 
 // private slots
 
diff --git a/src/nostalgia/studio/mainwindow.hpp b/src/nostalgia/studio/mainwindow.hpp
index 71cfd166..b97af15d 100644
--- a/src/nostalgia/studio/mainwindow.hpp
+++ b/src/nostalgia/studio/mainwindow.hpp
@@ -125,6 +125,9 @@ class MainWindow: public QMainWindow {
 
 		int closeProject();
 
+	public slots:
+		void onExit();
+
 	private slots:
 		int openProject();