diff --git a/include/gepetto/gui/mainwindow.hh b/include/gepetto/gui/mainwindow.hh
index 5b40a5f9243410e8fb2fa9ca759bdb745962a8e9..771294cd8fbdd5b48dfc4ab10823aebb2006d483 100644
--- a/include/gepetto/gui/mainwindow.hh
+++ b/include/gepetto/gui/mainwindow.hh
@@ -8,6 +8,7 @@
 #include <QLabel>
 
 #include <gepetto/viewer/group-node.h>
+#include <gepetto/viewer/corba/deprecated.hh>
 
 #include <gepetto/gui/fwd.hh>
 
@@ -70,7 +71,8 @@ namespace gepetto {
         }
 
         /// Get the central widget.
-        OSGWidget* centralWidget() const;
+        /// \deprecated Use \ref osgWindows instead
+        OSGWidget* centralWidget() const GEPETTO_VIEWER_CORBA_DEPRECATED;
 
         /// Get the list of windows.
         QList <OSGWidget*> osgWindows () const;
diff --git a/src/gui/mainwindow.cc b/src/gui/mainwindow.cc
index 54d6769c11a91051b93fa0083fe5914aa4e6c285..495d9b8c5698652736f4bcc8062c729ae6e12713 100644
--- a/src/gui/mainwindow.cc
+++ b/src/gui/mainwindow.cc
@@ -242,15 +242,14 @@ namespace gepetto {
 
     void MainWindow::addOSGWidget(OSGWidget* osgWidget)
     {
-      if (!osgWindows_.empty()) {
-        QDockWidget* dockOSG = new QDockWidget (
-            tr("OSG Viewer") + " " + QString::number (osgWindows_.size()), this);
-        dockOSG->setWidget(osgWidget);
-        addDockWidget(Qt::RightDockWidgetArea, dockOSG);
-      } else {
+      QDockWidget* dockOSG = new QDockWidget (
+          tr("Window ") + osgWidget->objectName(), this);
+      dockOSG->setWidget(osgWidget);
+      addDockWidget(Qt::RightDockWidgetArea, dockOSG);
+      if (osgWindows_.empty()) {
         // This OSGWidget should be the central view
         centralWidget_ = osgWidget;
-        setCentralWidget(centralWidget_);
+        setCentralWidget(0);
 #if GEPETTO_GUI_HAS_PYTHONQT
         pythonWidget_->addToContext("osg", centralWidget_);
 #endif