diff --git a/apps/openmw/mwgui/controllers.cpp b/apps/openmw/mwgui/controllers.cpp
index a50e6496cf..5ebd2b1e74 100644
--- a/apps/openmw/mwgui/controllers.cpp
+++ b/apps/openmw/mwgui/controllers.cpp
@@ -7,7 +7,7 @@ namespace MWGui
     namespace Controllers
     {
 
-        ControllerRepeatClick::ControllerRepeatClick() :
+        ControllerRepeatEvent::ControllerRepeatEvent() :
             mInit(0.5),
             mStep(0.1),
             mEnabled(true),
@@ -15,11 +15,11 @@ namespace MWGui
         {
         }
 
-        ControllerRepeatClick::~ControllerRepeatClick()
+        ControllerRepeatEvent::~ControllerRepeatEvent()
         {
         }
 
-        bool ControllerRepeatClick::addTime(MyGUI::Widget* _widget, float _time)
+        bool ControllerRepeatEvent::addTime(MyGUI::Widget* _widget, float _time)
         {
             if(mTimeLeft == 0)
                 mTimeLeft = mInit;
@@ -33,22 +33,22 @@ namespace MWGui
             return true;
         }
 
-        void ControllerRepeatClick::setRepeat(float init, float step)
+        void ControllerRepeatEvent::setRepeat(float init, float step)
         {
             mInit = init;
             mStep = step;
         }
 
-        void ControllerRepeatClick::setEnabled(bool enable)
+        void ControllerRepeatEvent::setEnabled(bool enable)
         {
             mEnabled = enable;
         }
 
-        void ControllerRepeatClick::setProperty(const std::string& _key, const std::string& _value)
+        void ControllerRepeatEvent::setProperty(const std::string& _key, const std::string& _value)
         {
         }
 
-        void ControllerRepeatClick::prepareItem(MyGUI::Widget* _widget)
+        void ControllerRepeatEvent::prepareItem(MyGUI::Widget* _widget)
         {
         }
 
diff --git a/apps/openmw/mwgui/controllers.hpp b/apps/openmw/mwgui/controllers.hpp
index 9378556065..003027a46a 100644
--- a/apps/openmw/mwgui/controllers.hpp
+++ b/apps/openmw/mwgui/controllers.hpp
@@ -9,14 +9,15 @@ namespace MWGui
 {
     namespace Controllers
     {
-        class ControllerRepeatClick :
+        // Should be removed when upgrading to MyGUI 3.2.2 (current git), it has ControllerRepeatClick
+        class ControllerRepeatEvent :
             public MyGUI::ControllerItem
         {
-            MYGUI_RTTI_DERIVED( ControllerRepeatClick )
+            MYGUI_RTTI_DERIVED( ControllerRepeatEvent )
 
         public:
-            ControllerRepeatClick();
-            virtual ~ControllerRepeatClick();
+            ControllerRepeatEvent();
+            virtual ~ControllerRepeatEvent();
 
             void setRepeat(float init, float step);
             void setEnabled(bool enable);
diff --git a/apps/openmw/mwgui/tradewindow.cpp b/apps/openmw/mwgui/tradewindow.cpp
index 9393446f1e..f09aff5ac8 100644
--- a/apps/openmw/mwgui/tradewindow.cpp
+++ b/apps/openmw/mwgui/tradewindow.cpp
@@ -393,8 +393,8 @@ namespace MWGui
 
     void TradeWindow::addRepeatController(MyGUI::Widget *widget)
     {
-        MyGUI::ControllerItem* item = MyGUI::ControllerManager::getInstance().createItem(Controllers::ControllerRepeatClick::getClassTypeName());
-        Controllers::ControllerRepeatClick* controller = item->castType<Controllers::ControllerRepeatClick>();
+        MyGUI::ControllerItem* item = MyGUI::ControllerManager::getInstance().createItem(Controllers::ControllerRepeatEvent::getClassTypeName());
+        Controllers::ControllerRepeatEvent* controller = item->castType<Controllers::ControllerRepeatEvent>();
         controller->eventRepeatClick += MyGUI::newDelegate(this, &TradeWindow::onRepeatClick);
         controller->setRepeat(sBalanceChangeInitialPause, sBalanceChangeInterval);
         MyGUI::ControllerManager::getInstance().addItem(widget, controller);
diff --git a/apps/openmw/mwgui/widgets.cpp b/apps/openmw/mwgui/widgets.cpp
index b45f7d59cd..6059d2d0d7 100644
--- a/apps/openmw/mwgui/widgets.cpp
+++ b/apps/openmw/mwgui/widgets.cpp
@@ -617,8 +617,8 @@ namespace MWGui
         void MWScrollBar::onDecreaseButtonPressed(MyGUI::Widget* _sender, int _left, int _top, MyGUI::MouseButton _id)
         {
             mIsIncreasing = false;
-            MyGUI::ControllerItem* item = MyGUI::ControllerManager::getInstance().createItem(MWGui::Controllers::ControllerRepeatClick::getClassTypeName());
-            MWGui::Controllers::ControllerRepeatClick* controller = item->castType<MWGui::Controllers::ControllerRepeatClick>();
+            MyGUI::ControllerItem* item = MyGUI::ControllerManager::getInstance().createItem(MWGui::Controllers::ControllerRepeatEvent::getClassTypeName());
+            MWGui::Controllers::ControllerRepeatEvent* controller = item->castType<MWGui::Controllers::ControllerRepeatEvent>();
             controller->eventRepeatClick += newDelegate(this, &MWScrollBar::repeatClick);
             controller->setEnabled(mEnableRepeat);
             controller->setRepeat(mRepeatTriggerTime, mRepeatStepTime);
@@ -633,8 +633,8 @@ namespace MWGui
         void MWScrollBar::onIncreaseButtonPressed(MyGUI::Widget* _sender, int _left, int _top, MyGUI::MouseButton _id)
         {
             mIsIncreasing = true;
-            MyGUI::ControllerItem* item = MyGUI::ControllerManager::getInstance().createItem(MWGui::Controllers::ControllerRepeatClick::getClassTypeName());
-            MWGui::Controllers::ControllerRepeatClick* controller = item->castType<MWGui::Controllers::ControllerRepeatClick>();
+            MyGUI::ControllerItem* item = MyGUI::ControllerManager::getInstance().createItem(MWGui::Controllers::ControllerRepeatEvent::getClassTypeName());
+            MWGui::Controllers::ControllerRepeatEvent* controller = item->castType<MWGui::Controllers::ControllerRepeatEvent>();
             controller->eventRepeatClick += newDelegate(this, &MWScrollBar::repeatClick);
             controller->setEnabled(mEnableRepeat);
             controller->setRepeat(mRepeatTriggerTime, mRepeatStepTime);
diff --git a/apps/openmw/mwgui/widgets.hpp b/apps/openmw/mwgui/widgets.hpp
index fc13b7ce58..fff7bdbfc8 100644
--- a/apps/openmw/mwgui/widgets.hpp
+++ b/apps/openmw/mwgui/widgets.hpp
@@ -298,6 +298,7 @@ namespace MWGui
         };
         typedef MWDynamicStat* MWDynamicStatPtr;
 
+        // Should be removed when upgrading to MyGUI 3.2.2 (current git), it has ScrollBar autorepeat support
         class MWScrollBar : public MyGUI::ScrollBar
         {
             MYGUI_RTTI_DERIVED(MWScrollBar)
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index a109c8c209..13c878d80c 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -176,7 +176,7 @@ namespace MWGui
         ItemView::registerComponents();
         ItemWidget::registerComponents();
 
-        MyGUI::FactoryManager::getInstance().registerFactory<MWGui::Controllers::ControllerRepeatClick>("Controller");
+        MyGUI::FactoryManager::getInstance().registerFactory<MWGui::Controllers::ControllerRepeatEvent>("Controller");
         MyGUI::FactoryManager::getInstance().registerFactory<MWGui::Controllers::ControllerFollowMouse>("Controller");
 
         MyGUI::FactoryManager::getInstance().registerFactory<ResourceImageSetPointerFix>("Resource", "ResourceImageSetPointer");