diff --git a/examples/code_fragments/ui/widget_example.py b/examples/code_fragments/ui/widget_example.py
index 1c996c2535bc4d5a7495feff42ec370e02afe2c2..ced1d02fa6b3422b41016a8fd8487c3f6479810b 100644
--- a/examples/code_fragments/ui/widget_example.py
+++ b/examples/code_fragments/ui/widget_example.py
@@ -26,7 +26,7 @@ from board import Board
 panels=gui.GostyApp.Instance().perspective.panels
 
 #Create Widget
-tetris=Board(panels.qobject)
+tetris=Board()
 
 #Wrap widget to Qt Widget
 wid=gui.Widget(tetris)
diff --git a/modules/gui/src/gosty_app.cc b/modules/gui/src/gosty_app.cc
index ec2a6b14c4d4056ffc580a046281fe6c7a547789..de0b008cc42957e2f5a60efd975d1f86935b5231 100644
--- a/modules/gui/src/gosty_app.cc
+++ b/modules/gui/src/gosty_app.cc
@@ -122,17 +122,8 @@ ost::img::gui::DataViewer* GostyApp::CreateDataViewer(const ost::img::ImageHandl
   }
   else
   {
-    viewer=new ost::img::gui::DataViewer(main_,d,name);
-    QMdiSubWindow* mdi=new QMdiSubWindow(this->GetPerspective()->GetMainArea());
-    mdi->setWindowTitle(name);
-    mdi->setWidget(viewer);
-    mdi->setFocusProxy(viewer);
-    viewer->setAttribute(Qt::WA_DeleteOnClose);
-    mdi->setAttribute(Qt::WA_DeleteOnClose);
-    viewer->setParent(mdi);
-    this->GetPerspective()->GetMainArea()->addSubWindow(mdi);
-    mdi->showMaximized();
-    connect(viewer,SIGNAL(released()),mdi,SLOT(close()));
+    viewer=new ost::img::gui::DataViewer(NULL,d,name);
+    this->GetPerspective()->GetMainArea()->AddWidget(name, viewer);
   }
 
   return viewer;