diff --git a/apps/openmw/mwgui/window_pinnable_base.cpp b/apps/openmw/mwgui/window_pinnable_base.cpp
index 781c427ef..651b3a1e9 100644
--- a/apps/openmw/mwgui/window_pinnable_base.cpp
+++ b/apps/openmw/mwgui/window_pinnable_base.cpp
@@ -9,26 +9,20 @@ using namespace MWGui;
 WindowPinnableBase::WindowPinnableBase(const std::string& parLayout, MWBase::WindowManager& parWindowManager)
   : WindowBase(parLayout, parWindowManager), mPinned(false), mVisible(false)
 {
-    MyGUI::WindowPtr t = static_cast<MyGUI::WindowPtr>(mMainWidget);
-    t->eventWindowButtonPressed += MyGUI::newDelegate(this, &WindowPinnableBase::onWindowButtonPressed);
-
     ExposedWindow* window = static_cast<ExposedWindow*>(mMainWidget);
     mPinButton = window->getSkinWidget ("Button");
+
+    mPinButton->eventMouseButtonClick += MyGUI::newDelegate(this, &WindowPinnableBase::onPinButtonClicked);
 }
 
-void WindowPinnableBase::onWindowButtonPressed(MyGUI::Window* sender, const std::string& eventName)
+void WindowPinnableBase::onPinButtonClicked(MyGUI::Widget* _sender)
 {
-    if ("PinToggle" == eventName)
-    {
-        mPinned = !mPinned;
+    mPinned = !mPinned;
 
-        if (mPinned)
-            mPinButton->changeWidgetSkin ("PinDown");
-        else
-            mPinButton->changeWidgetSkin ("PinUp");
+    if (mPinned)
+        mPinButton->changeWidgetSkin ("PinDown");
+    else
+        mPinButton->changeWidgetSkin ("PinUp");
 
-        onPinToggled();
-    }
-
-    eventDone(this);
+    onPinToggled();
 }
diff --git a/apps/openmw/mwgui/window_pinnable_base.hpp b/apps/openmw/mwgui/window_pinnable_base.hpp
index 7426b16fc..50259858e 100644
--- a/apps/openmw/mwgui/window_pinnable_base.hpp
+++ b/apps/openmw/mwgui/window_pinnable_base.hpp
@@ -14,7 +14,7 @@ namespace MWGui
         bool pinned() { return mPinned; }
 
     private:
-        void onWindowButtonPressed(MyGUI::Window* sender, const std::string& eventName);
+        void onPinButtonClicked(MyGUI::Widget* _sender);
 
     protected:
         virtual void onPinToggled() = 0;
diff --git a/files/mygui/openmw_windows.skin.xml b/files/mygui/openmw_windows.skin.xml
index 93aa8fd20..73f68e80d 100644
--- a/files/mygui/openmw_windows.skin.xml
+++ b/files/mygui/openmw_windows.skin.xml
@@ -585,9 +585,7 @@
             <Property key="Scale" value = "1 1 0 0"/>
         </Child>
 
-        <Child type="Button" skin="PinUp" offset="232 4 19 19" align="ALIGN_RIGHT ALIGN_TOP" name="Button">
-            <Property key="Event" value="PinToggle"/>
-        </Child>
+        <Child type="Button" skin="PinUp" offset="232 4 19 19" align="ALIGN_RIGHT ALIGN_TOP" name="Button"/>
     </Skin>
 
     <Skin name = "MW_Dialog" size = "256 54">