diff --git a/apps/openmw/mwgui/settingswindow.cpp b/apps/openmw/mwgui/settingswindow.cpp
index df5aa1a40..3ab2a6ce3 100644
--- a/apps/openmw/mwgui/settingswindow.cpp
+++ b/apps/openmw/mwgui/settingswindow.cpp
@@ -233,6 +233,7 @@ namespace MWGui
             if (mResolutionList->findItemIndexWith(str) == MyGUI::ITEM_NONE)
                 mResolutionList->addItem(str);
         }
+        highlightCurrentResolution();
 
         std::string tf = Settings::Manager::getString("texture filtering", "General");
         mTextureFilteringButton->setCaption(textureFilteringToStr(tf));
@@ -299,8 +300,28 @@ namespace MWGui
     }
 
     void SettingsWindow::onResolutionCancel()
+    {
+        highlightCurrentResolution();
+    }
+
+    void SettingsWindow::highlightCurrentResolution()
     {
         mResolutionList->setIndexSelected(MyGUI::ITEM_NONE);
+
+        int currentX = Settings::Manager::getInt("resolution x", "Video");
+        int currentY = Settings::Manager::getInt("resolution y", "Video");
+
+        for (size_t i=0; i<mResolutionList->getItemCount(); ++i)
+        {
+            int resX, resY;
+            parseResolution (resX, resY, mResolutionList->getItemNameAt(i));
+
+            if (resX == currentX && resY == currentY)
+            {
+                mResolutionList->setIndexSelected(i);
+                break;
+            }
+        }
     }
 
     void SettingsWindow::onShadowTextureSizeChanged(MyGUI::ComboBox *_sender, size_t pos)
diff --git a/apps/openmw/mwgui/settingswindow.hpp b/apps/openmw/mwgui/settingswindow.hpp
index 45d489284..79487c54b 100644
--- a/apps/openmw/mwgui/settingswindow.hpp
+++ b/apps/openmw/mwgui/settingswindow.hpp
@@ -59,6 +59,7 @@ namespace MWGui
             void onResolutionSelected(MyGUI::ListBox* _sender, size_t index);
             void onResolutionAccept();
             void onResolutionCancel();
+            void highlightCurrentResolution();
 
             void onShadowTextureSizeChanged(MyGUI::ComboBox* _sender, size_t pos);