diff --git a/modules/game_cyclopedia/tab/bestiary/bestiary.lua b/modules/game_cyclopedia/tab/bestiary/bestiary.lua
index b260225246..971181ec26 100644
--- a/modules/game_cyclopedia/tab/bestiary/bestiary.lua
+++ b/modules/game_cyclopedia/tab/bestiary/bestiary.lua
@@ -794,15 +794,24 @@ function onTrackerClick(widget, mousePosition, mouseButton)
 end
 
 function onAddLootClick(widget, mousePosition, mouseButton)
-    local taskId = tonumber(widget:getId())
+    local itemId = widget:getItemId()
+    local quickLoot = modules.game_quickloot.QuickLoot
+    local lootFilterValue = quickLoot.data.filter
     local menu = g_ui.createWidget("PopupMenu")
 
     menu:setGameMenu(true)
-    --if true then -- is in loot list ?
-        menu:addOption("Add to Loot List", function() print("future") end)
-    --else
-        --menu:addOption("Remove from Loot List", function() print("future") end)
-    --end
+
+    if not quickLoot.lootExists(itemId, lootFilterValue) then
+        menu:addOption("Add to Loot List",
+        function()
+            quickLoot.addLootList(itemId, lootFilterValue)
+        end)
+    else
+        menu:addOption("Remove from Loot List", 
+        function() 
+            quickLoot.removeLootList(itemId, lootFilterValue)
+        end)
+    end
 
     menu:display(menuPosition)