diff --git a/apps/openmw/mwgui/settingswindow.cpp b/apps/openmw/mwgui/settingswindow.cpp
index 02353c5d41..7f8d98ee05 100644
--- a/apps/openmw/mwgui/settingswindow.cpp
+++ b/apps/openmw/mwgui/settingswindow.cpp
@@ -1128,4 +1128,38 @@ namespace MWGui
         mResolutionList->setScrollPosition(0);
         mControlsBox->setViewOffset(MyGUI::IntPoint(0, 0));
     }
+
+    bool SettingsWindow::onControllerButtonEvent(const SDL_ControllerButtonEvent& arg)
+    {
+        if (arg.button == SDL_CONTROLLER_BUTTON_B)
+        {
+            onOkButtonClicked(mOkButton);
+            return true;
+        }
+        else if (arg.button == SDL_CONTROLLER_BUTTON_LEFTSHOULDER)
+        {
+            uint32_t index = mSettingsTab->getIndexSelected();
+            if (index <= 0)
+                index = mSettingsTab->getItemCount() - 1;
+            else
+                index--;
+            mSettingsTab->setIndexSelected(index);
+
+            return true;
+        }
+        else if (arg.button == SDL_CONTROLLER_BUTTON_RIGHTSHOULDER)
+        {
+            uint32_t index = mSettingsTab->getIndexSelected();
+            if (index >= mSettingsTab->getItemCount() - 1)
+                index = 0;
+            else
+                index++;
+            mSettingsTab->setIndexSelected(index);
+
+            return true;
+        }
+
+        return false;
+    }
+
 }
diff --git a/apps/openmw/mwgui/settingswindow.hpp b/apps/openmw/mwgui/settingswindow.hpp
index dc4e09f8ac..555468d806 100644
--- a/apps/openmw/mwgui/settingswindow.hpp
+++ b/apps/openmw/mwgui/settingswindow.hpp
@@ -26,6 +26,8 @@ namespace MWGui
 
         void onResChange(int, int) override;
 
+        bool onControllerButtonEvent(const SDL_ControllerButtonEvent& arg) override;
+
     protected:
         MyGUI::TabControl* mSettingsTab;
         MyGUI::Button* mOkButton;