diff --git a/apps/openmw/mwgui/quickkeysmenu.cpp b/apps/openmw/mwgui/quickkeysmenu.cpp
index deabb299e6..b8f52cd1fb 100644
--- a/apps/openmw/mwgui/quickkeysmenu.cpp
+++ b/apps/openmw/mwgui/quickkeysmenu.cpp
@@ -269,8 +269,35 @@ namespace MWGui
 
         MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();
         MWWorld::InventoryStore& store = MWWorld::Class::get(player).getInventoryStore(player);
-        MWMechanics::CreatureStats& stats = MWWorld::Class::get(player).getCreatureStats(player);
-        MWMechanics::Spells& spells = stats.getSpells();
+
+        if (type == Type_Item || type == Type_MagicItem)
+        {
+            MWWorld::Ptr item = *button->getChildAt (0)->getUserData<MWWorld::Ptr>();
+            // make sure the item is available
+            if (item.getRefData ().getCount() < 1)
+            {
+                // Try searching for a compatible replacement
+                std::string id = item.getCellRef().mRefID;
+
+                for (MWWorld::ContainerStoreIterator it = store.begin(); it != store.end(); ++it)
+                {
+                    if (Misc::StringUtils::ciEqual(it->getCellRef().mRefID, id))
+                    {
+                        item = *it;
+                        button->getChildAt(0)->setUserData(item);
+                        break;
+                    }
+                }
+
+                if (item.getRefData().getCount() < 1)
+                {
+                    // No replacement was found
+                    MWBase::Environment::get().getWindowManager ()->messageBox (
+                                "#{sQuickMenu5} " + MWWorld::Class::get(item).getName(item));
+                    return;
+                }
+            }
+        }
 
         if (type == Type_Magic)
         {
@@ -282,15 +309,6 @@ namespace MWGui
         {
             MWWorld::Ptr item = *button->getChildAt (0)->getUserData<MWWorld::Ptr>();
 
-            // make sure the item is available
-            if (item.getRefData ().getCount() < 1)
-            {
-                // TODO: Try to find a replacement with the same ID?
-                MWBase::Environment::get().getWindowManager ()->messageBox (
-                            "#{sQuickMenu5} " + MWWorld::Class::get(item).getName(item));
-                return;
-            }
-
             boost::shared_ptr<MWWorld::Action> action = MWWorld::Class::get(item).use(item);
 
             action->execute (MWBase::Environment::get().getWorld()->getPlayer().getPlayer());
@@ -309,14 +327,6 @@ namespace MWGui
         {
             MWWorld::Ptr item = *button->getChildAt (0)->getUserData<MWWorld::Ptr>();
 
-            // make sure the item is available
-            if (item.getRefData ().getCount() == 0)
-            {
-                MWBase::Environment::get().getWindowManager ()->messageBox (
-                            "#{sQuickMenu5} " + MWWorld::Class::get(item).getName(item));
-                return;
-            }
-
             // retrieve ContainerStoreIterator to the item
             MWWorld::ContainerStoreIterator it = store.begin();
             for (; it != store.end(); ++it)
@@ -335,9 +345,6 @@ namespace MWGui
 
                 MWWorld::ActionEquip action(item);
                 action.execute (MWBase::Environment::get().getWorld ()->getPlayer ().getPlayer ());
-
-                // since we changed equipping status, update the inventory window
-                MWBase::Environment::get().getWindowManager()->getInventoryWindow()->updateItemView();
             }
 
             store.setSelectedEnchantItem(it);