diff --git a/demos/mainwindow/mainwindow.cpp b/demos/mainwindow/mainwindow.cpp
index a58a713..bb78471 100644
--- a/demos/mainwindow/mainwindow.cpp
+++ b/demos/mainwindow/mainwindow.cpp
@@ -61,6 +61,7 @@
 #include <QComboBox>
 #include <QLabel>
 #include <QPushButton>
+#include <QSettings>
 #include <qdebug.h>

 static const char * const message =
@@ -98,10 +99,22 @@ MainWindow::MainWindow(const QMap<QString, QSize> &customSizeHints,
     setupToolBar();
     setupMenuBar();
     setupDockWidgets(customSizeHints);
+//    setUnifiedTitleAndToolBarOnMac(true);
+
+    QSettings settings("MyCompany", "MyApp");
+    restoreGeometry(settings.value("geometry").toByteArray());
+    restoreState(settings.value("windowState").toByteArray());

     statusBar()->showMessage(tr("Status Bar"));
 }

+void MainWindow::closeEvent(QCloseEvent *event)
+{
+    QSettings settings("MyCompany", "MyApp");
+    settings.setValue("geometry", saveGeometry());
+    settings.setValue("windowState", saveState());
+    QMainWindow::closeEvent(event);
+}
 void MainWindow::actionTriggered(QAction *action)
 {
     qDebug("action '%s' triggered", action->text().toLocal8Bit().data());
diff --git a/demos/mainwindow/mainwindow.h b/demos/mainwindow/mainwindow.h
index aa01ffa..b611d80 100644
--- a/demos/mainwindow/mainwindow.h
+++ b/demos/mainwindow/mainwindow.h
@@ -68,6 +68,7 @@ public:

 protected:
     void showEvent(QShowEvent *event);
+    void closeEvent(QCloseEvent *event);

 public slots:
     void actionTriggered(QAction *action);