diff --git a/apps/openmw/mwgui/class.cpp b/apps/openmw/mwgui/class.cpp
index 0ec07c650..ee13e7719 100644
--- a/apps/openmw/mwgui/class.cpp
+++ b/apps/openmw/mwgui/class.cpp
@@ -15,15 +15,10 @@ using namespace MWGui;
 /* GenerateClassResultDialog */
 
 GenerateClassResultDialog::GenerateClassResultDialog(MWWorld::Environment& environment)
-  : Layout("openmw_chargen_generate_class_result_layout.xml")
-  , environment(environment)
+  : WindowBase("openmw_chargen_generate_class_result_layout.xml", environment)
 {
     // Centre dialog
-    MyGUI::IntSize gameWindowSize = environment.mWindowManager->getGui()->getViewSize();
-    MyGUI::IntCoord coord = mMainWidget->getCoord();
-    coord.left = (gameWindowSize.width - coord.width)/2;
-    coord.top = (gameWindowSize.height - coord.height)/2;
-    mMainWidget->setCoord(coord);
+    center();
 
     WindowManager *wm = environment.mWindowManager;
     setText("ReflectT", wm->getGameSettingString("sMessageQuestionAnswer1", ""));
diff --git a/apps/openmw/mwgui/class.hpp b/apps/openmw/mwgui/class.hpp
index 816152e3a..fbbd7efbf 100644
--- a/apps/openmw/mwgui/class.hpp
+++ b/apps/openmw/mwgui/class.hpp
@@ -75,7 +75,7 @@ namespace MWGui
         ClassChoiceDialog(MWWorld::Environment& environment);
     };
 
-    class GenerateClassResultDialog : public OEngine::GUI::Layout
+    class GenerateClassResultDialog : public WindowBase
     {
     public:
         GenerateClassResultDialog(MWWorld::Environment& environment);
@@ -103,8 +103,6 @@ namespace MWGui
         void onBackClicked(MyGUI::Widget* _sender);
 
     private:
-        MWWorld::Environment& environment;
-
         MyGUI::StaticImagePtr classImage;
         MyGUI::StaticTextPtr  className;