diff --git a/include/gepetto/gui/settings.hh b/include/gepetto/gui/settings.hh
index 62469ba795505feea938ef506bef75443c4f2760..c023077f087845c955eaf0e2191e06891c0ab708 100644
--- a/include/gepetto/gui/settings.hh
+++ b/include/gepetto/gui/settings.hh
@@ -38,6 +38,7 @@ namespace gepetto {
       std::string configurationFile;
       std::string predifinedRobotConf;
       std::string predifinedEnvConf;
+      std::string stateConf;
 
       bool verbose;
       bool noPlugin;
@@ -111,6 +112,9 @@ namespace gepetto {
       /// \note Prefer using Settings::fromFiles()
       void readSettingFile ();
 
+      void saveState () const;
+      void restoreState () const;
+
     private:
       void writeRobotFile ();
       void writeEnvFile ();
diff --git a/pyplugins/gepetto/gui/blenderexport.py b/pyplugins/gepetto/gui/blenderexport.py
index 71e4895d22463954e365f109daee5e41fbe8f9f5..175cd7b3761aeaa955141a8abeb3b477b089cca7 100644
--- a/pyplugins/gepetto/gui/blenderexport.py
+++ b/pyplugins/gepetto/gui/blenderexport.py
@@ -87,11 +87,9 @@ class _Widget (QtGui.QWidget):
 ###     gepetto.gui.blenderexport=true
 ###
 class Plugin(QtGui.QDockWidget):
-    def __init__ (self, mainWindow, flags = None):
-        if flags is None:
-            super(Plugin, self).__init__ ("Blender export plugin", mainWindow)
-        else:
-            super(Plugin, self).__init__ ("Blender export plugin", mainWindow, flags)
+    def __init__ (self, mainWindow):
+        super(Plugin, self).__init__ ("Blender export plugin", mainWindow)
+        self.setObjectName ("gepetto.gui.blenderexport")
         self.resetConnection()
         # Initialize the widget
         mainWidget = _Widget(self, self)
diff --git a/pyplugins/gepetto/gui/pythonwidget.py b/pyplugins/gepetto/gui/pythonwidget.py
index 33d614e5189d69d2750ae366f30c372663a39c40..2ba8f460bb6f5e96ee4f00d4d3e9b6df2ca27bac 100644
--- a/pyplugins/gepetto/gui/pythonwidget.py
+++ b/pyplugins/gepetto/gui/pythonwidget.py
@@ -81,11 +81,8 @@ class Plugin(QtGui.QDockWidget):
     Example of plugin of the Gepetto Viewer GUI. This can interact with
     PythonWidget C++ class.
     """
-    def __init__ (self, mainWindow, flags = None):
-        if flags is None:
-            super(Plugin, self).__init__ ("Gepetto Viewer plugin", mainWindow)
-        else:
-            super(Plugin, self).__init__ ("Gepetto Viewer plugin", mainWindow, flags)
+    def __init__ (self, mainWindow):
+        super(Plugin, self).__init__ ("Gepetto Viewer plugin", mainWindow)
         self.setObjectName("Gepetto Viewer plugin")
         self.client = Client()
         # Initialize the widget
diff --git a/src/gui/main.cc.in b/src/gui/main.cc.in
index f5bdb13c006dcf3fa5d1a6e39c9b99df4a411f02..cf5bc14940d9c7e7330c950f214ebb6e124ada93 100644
--- a/src/gui/main.cc.in
+++ b/src/gui/main.cc.in
@@ -83,8 +83,11 @@ int main(int argc, char *argv[])
   w.setWindowIcon (pixmap);
   settings.setMainWindow (&w);
   settings.initPlugins ();
+  settings.restoreState ();
   w.connect (&a, SIGNAL (log(QString)), SLOT (logError(const QString&)));
   w.show();
   splash.finish(&w);
-  return a.exec();
+  int retCode = a.exec();
+  settings.saveState ();
+  return retCode;
 }
diff --git a/src/gui/mainwindow.cc b/src/gui/mainwindow.cc
index 879e4a5d6481ccd99461865d913b1cb9d3754b67..92dfd5fdad65cb63b53f71497961bedee6bd2535 100644
--- a/src/gui/mainwindow.cc
+++ b/src/gui/mainwindow.cc
@@ -258,6 +258,7 @@ namespace gepetto {
     {
       QDockWidget* dockOSG = new QDockWidget (
           tr("Window ") + osgWidget->objectName(), this);
+      dockOSG->setObjectName ("gepetto-gui.osg." + osgWidget->objectName());
       dockOSG->setWidget(osgWidget);
       connect(dockOSG,SIGNAL(visibilityChanged(bool)),SLOT(dockVisibilityChanged(bool)));
       addDockWidget(Qt::RightDockWidgetArea, dockOSG);
diff --git a/src/gui/pythonwidget.cc b/src/gui/pythonwidget.cc
index 1041426322121658dbf23ec1fcae8507ebad4c33..612f8e3fcb3a3681c6f24da62f4c06c77a7fd358 100644
--- a/src/gui/pythonwidget.cc
+++ b/src/gui/pythonwidget.cc
@@ -57,6 +57,7 @@ namespace gepetto {
       PythonWidget::PythonWidget(QWidget *parent) :
         QDockWidget("&PythonQt console", parent)
       {
+        setObjectName ("gepetto-gui.pythonqtconsole");
         PythonQt::init(PythonQt::RedirectStdOut);
         PythonQt_init_QtBindings();
         PythonQtObjectPtr mainContext = PythonQt::self()->getMainModule();
diff --git a/src/gui/settings.cc b/src/gui/settings.cc
index c26a8f5910e6c376ebc39d9194030d671e1f38c5..8d7a28ad52ff963c313fbf0bafd1d79d717fd18f 100644
--- a/src/gui/settings.cc
+++ b/src/gui/settings.cc
@@ -37,6 +37,7 @@ namespace gepetto {
       : configurationFile ("settings")
       , predifinedRobotConf ("robots")
       , predifinedEnvConf ("environments")
+      , stateConf (".state")
       , verbose (false)
       , noPlugin (false)
       , startGepettoCorbaServer (true)
@@ -198,6 +199,38 @@ namespace gepetto {
 #endif
     }
 
+    void Settings::restoreState () const
+    {
+      QSettings settings (QSettings::SystemScope,
+          QCoreApplication::organizationName (),
+          getQSettingsFileName (stateConf));
+      if (settings.status() != QSettings::NoError) {
+        qDebug () << "Could not restore the window state from" << settings.fileName();
+      } else {
+        settings.beginGroup("mainWindow");
+        mw->restoreGeometry (settings.value("geometry").toByteArray());
+        mw->restoreState (settings.value("state").toByteArray());
+        mw->centralWidget()->setVisible (settings.value("centralWidgetVisibility", true).toBool());
+        settings.endGroup();
+      }
+    }
+
+    void Settings::saveState () const
+    {
+      QSettings settings (QSettings::SystemScope,
+          QCoreApplication::organizationName (),
+          getQSettingsFileName (stateConf));
+      if (settings.status() != QSettings::NoError) {
+        qDebug () << "Could not save the window state to" << settings.fileName();
+      } else {
+        settings.beginGroup("mainWindow");
+        settings.setValue("geometry", mw->saveGeometry());
+        settings.setValue("state"   , mw->saveState());
+        settings.setValue("centralWidgetVisibility", mw->centralWidget()->isVisible ());
+        settings.endGroup();
+      }
+    }
+
     void Settings::setMainWindow(gepetto::gui::MainWindow *main)
     {
       mw = main;