diff --git a/apps/openmw/mwgui/class.cpp b/apps/openmw/mwgui/class.cpp
index 1c8cc78403..9f6306830b 100644
--- a/apps/openmw/mwgui/class.cpp
+++ b/apps/openmw/mwgui/class.cpp
@@ -718,6 +718,11 @@ namespace MWGui
     }
 
     void SelectSpecializationDialog::onCancelClicked(MyGUI::Widget* _sender)
+    {
+        exit();
+    }
+
+    void SelectSpecializationDialog::exit()
     {
         eventCancel();
     }
@@ -764,6 +769,11 @@ namespace MWGui
     }
 
     void SelectAttributeDialog::onCancelClicked(MyGUI::Widget* _sender)
+    {
+        exit();
+    }
+
+    void SelectAttributeDialog::exit()
     {
         eventCancel();
     }
@@ -855,6 +865,11 @@ namespace MWGui
     }
 
     void SelectSkillDialog::onCancelClicked(MyGUI::Widget* _sender)
+    {
+        exit();
+    }
+
+    void SelectSkillDialog::exit()
     {
         eventCancel();
     }
diff --git a/apps/openmw/mwgui/class.hpp b/apps/openmw/mwgui/class.hpp
index f78f7541b2..5c23c834d7 100644
--- a/apps/openmw/mwgui/class.hpp
+++ b/apps/openmw/mwgui/class.hpp
@@ -136,6 +136,8 @@ namespace MWGui
         SelectSpecializationDialog();
         ~SelectSpecializationDialog();
 
+        virtual void exit();
+
         ESM::Class::Specialization getSpecializationId() const { return mSpecializationId; }
 
         // Events
@@ -167,6 +169,8 @@ namespace MWGui
         SelectAttributeDialog();
         ~SelectAttributeDialog();
 
+        virtual void exit();
+
         ESM::Attribute::AttributeID getAttributeId() const { return mAttributeId; }
 
         // Events
@@ -196,6 +200,8 @@ namespace MWGui
         SelectSkillDialog();
         ~SelectSkillDialog();
 
+        virtual void exit();
+
         ESM::Skill::SkillEnum getSkillId() const { return mSkillId; }
 
         // Events
diff --git a/apps/openmw/mwgui/countdialog.cpp b/apps/openmw/mwgui/countdialog.cpp
index 02ccbbc053..53c33b3c48 100644
--- a/apps/openmw/mwgui/countdialog.cpp
+++ b/apps/openmw/mwgui/countdialog.cpp
@@ -49,7 +49,12 @@ namespace MWGui
         mItemEdit->setCaption(boost::lexical_cast<std::string>(maxCount));
     }
 
-    void CountDialog::cancel()
+    void CountDialog::cancel() //Keeping this here as I don't know if anything else relies on it.
+    {
+        exit();
+    }
+
+    void CountDialog::exit()
     {
         setVisible(false);
     }
@@ -65,16 +70,16 @@ namespace MWGui
 
         setVisible(false);
     }
-    
+
     // essentially duplicating what the OK button does if user presses
     // Enter key
     void CountDialog::onEnterKeyPressed(MyGUI::EditBox* _sender)
     {
         eventOkClicked(NULL, mSlider->getScrollPosition()+1);
-	
+
         setVisible(false);
     }
-    
+
     void CountDialog::onEditTextChange(MyGUI::EditBox* _sender)
     {
         if (_sender->getCaption() == "")
diff --git a/apps/openmw/mwgui/countdialog.hpp b/apps/openmw/mwgui/countdialog.hpp
index 06de3eb887..a00b0b223b 100644
--- a/apps/openmw/mwgui/countdialog.hpp
+++ b/apps/openmw/mwgui/countdialog.hpp
@@ -11,6 +11,7 @@ namespace MWGui
             CountDialog();
             void open(const std::string& item, const std::string& message, const int maxCount);
             void cancel();
+            virtual void exit();
 
             typedef MyGUI::delegates::CMultiDelegate2<MyGUI::Widget*, int> EventHandle_WidgetInt;
 
diff --git a/apps/openmw/mwgui/windowbase.cpp b/apps/openmw/mwgui/windowbase.cpp
index 4dcb680ec0..c2515a6ded 100644
--- a/apps/openmw/mwgui/windowbase.cpp
+++ b/apps/openmw/mwgui/windowbase.cpp
@@ -56,11 +56,6 @@ void WindowModal::close()
     MWBase::Environment::get().getWindowManager()->removeCurrentModal(this);
 }
 
-void WindowModal::exit()
-{
-    close();
-}
-
 NoDrop::NoDrop(DragAndDrop *drag, MyGUI::Widget *widget)
     : mDrag(drag), mWidget(widget), mTransparent(false)
 {
diff --git a/apps/openmw/mwgui/windowbase.hpp b/apps/openmw/mwgui/windowbase.hpp
index 79ab282990..471d8ac709 100644
--- a/apps/openmw/mwgui/windowbase.hpp
+++ b/apps/openmw/mwgui/windowbase.hpp
@@ -47,7 +47,7 @@ namespace MWGui
         WindowModal(const std::string& parLayout);
         virtual void open();
         virtual void close();
-        virtual void exit();
+        virtual void exit() {}
     };
 
     /// A window that cannot be the target of a drag&drop action.