diff --git a/apps/openmw/mwgui/quickkeysmenu.cpp b/apps/openmw/mwgui/quickkeysmenu.cpp
index 5bf5a4df63..1ada078ab6 100644
--- a/apps/openmw/mwgui/quickkeysmenu.cpp
+++ b/apps/openmw/mwgui/quickkeysmenu.cpp
@@ -79,14 +79,11 @@ namespace MWGui
         delete mMagicSelectionDialog;
     }
 
-    // Check if quick keys are still valid
-    void QuickKeysMenu::validate(MWWorld::Ptr player)
+    inline void QuickKeysMenu::validate(int index)
     {
+        MWWorld::Ptr player = MWMechanics::getPlayer();
         MWWorld::InventoryStore& store = player.getClass().getInventoryStore(player);
-
-        for (int i = 0; i < 10; ++i)
-        {
-            switch (mKey[i].type)
+            switch (mKey[index].type)
             {
             case Type_Unassigned:
             case Type_HandToHand:
@@ -95,31 +92,34 @@ namespace MWGui
             case Type_Item:
             case Type_MagicItem:
             {
-                MWWorld::Ptr item = *mKey[i].button->getUserData<MWWorld::Ptr>();
+                MWWorld::Ptr item = *mKey[index].button->getUserData<MWWorld::Ptr>();
                 // Make sure the item is available and is not broken
+                std::cout << item << std::endl;
                 if (!item || item.getRefData().getCount() < 1 ||
                     (item.getClass().hasItemHealth(item) &&
                         item.getClass().getItemHealth(item) <= 0))
                 {
                     // Try searching for a compatible replacement
-                    item = store.findReplacement(mKey[i].id);
+                    item = store.findReplacement(mKey[index].id);
 
                     if (item)
-                        mKey[i].button->setUserData(MWWorld::Ptr(item));
+                        mKey[index].button->setUserData(MWWorld::Ptr(item));
 
                     break;
                 }
             }
             }
-        }
     }
 
     void QuickKeysMenu::onOpen()
     {
         WindowBase::onOpen();
 
-        MWWorld::Ptr player = MWMechanics::getPlayer();
-        validate(player);
+        // Quick key index
+        for (int index = 0; index < 10; ++index)
+        {
+            validate(index);
+        }
     }
 
     void QuickKeysMenu::unassign(keyData* key)
@@ -334,12 +334,12 @@ namespace MWGui
         assert(index >= 1 && index <= 10);
 
         keyData *key = &mKey[index-1];
-
+        
         MWWorld::Ptr player = MWMechanics::getPlayer();
         MWWorld::InventoryStore& store = player.getClass().getInventoryStore(player);
         const MWMechanics::CreatureStats &playerStats = player.getClass().getCreatureStats(player);
 
-        validate(player);
+        validate(index-1);
 
         // Delay action executing,
         // if player is busy for now (casting a spell, attacking someone, etc.)
diff --git a/apps/openmw/mwgui/quickkeysmenu.hpp b/apps/openmw/mwgui/quickkeysmenu.hpp
index bfb54e5d16..4761c98ceb 100644
--- a/apps/openmw/mwgui/quickkeysmenu.hpp
+++ b/apps/openmw/mwgui/quickkeysmenu.hpp
@@ -32,7 +32,6 @@ namespace MWGui
         void onAssignMagicItem (MWWorld::Ptr item);
         void onAssignMagic (const std::string& spellId);
         void onAssignMagicCancel ();
-        void validate(MWWorld::Ptr player);
         void onOpen() override;
 
         void activateQuickKey(int index);
@@ -77,7 +76,8 @@ namespace MWGui
 
         void onQuickKeyButtonClicked(MyGUI::Widget* sender);
         void onOkButtonClicked(MyGUI::Widget* sender);
-
+        // Check if quick key is still valid
+        inline void validate(int index);
         void unassign(keyData* key);
     };