diff --git a/apps/openmw/mwgui/class.cpp b/apps/openmw/mwgui/class.cpp
index ee13e7719..8466c9d3e 100644
--- a/apps/openmw/mwgui/class.cpp
+++ b/apps/openmw/mwgui/class.cpp
@@ -69,15 +69,10 @@ void GenerateClassResultDialog::onBackClicked(MyGUI::Widget* _sender)
 /* PickClassDialog */
 
 PickClassDialog::PickClassDialog(MWWorld::Environment& environment)
-  : Layout("openmw_chargen_class_layout.xml")
-  , environment(environment)
+  : WindowBase("openmw_chargen_class_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("SpecializationT", wm->getGameSettingString("sChooseClassMenu1", "Specialization"));
diff --git a/apps/openmw/mwgui/class.hpp b/apps/openmw/mwgui/class.hpp
index fbbd7efbf..28c2df3c7 100644
--- a/apps/openmw/mwgui/class.hpp
+++ b/apps/openmw/mwgui/class.hpp
@@ -109,7 +109,7 @@ namespace MWGui
         std::string currentClassId;
     };
 
-    class PickClassDialog : public OEngine::GUI::Layout
+    class PickClassDialog : public WindowBase
     {
     public:
         PickClassDialog(MWWorld::Environment& environment);
@@ -143,8 +143,6 @@ namespace MWGui
         void updateClasses();
         void updateStats();
 
-        MWWorld::Environment& environment;
-
         MyGUI::StaticImagePtr classImage;
         MyGUI::ListPtr        classList;
         MyGUI::StaticTextPtr  specializationName;