diff --git a/libraries/entropy/db.py b/libraries/entropy/db.py
index 1162e2de8..bda50f093 100644
--- a/libraries/entropy/db.py
+++ b/libraries/entropy/db.py
@@ -8010,7 +8010,7 @@ class EntropyRepository:
         # seek in repository first
         keyword_repo = self.SystemSettings['keywords']['repositories']
 
-        for keyword in keyword_repo.get(reponame, []):
+        for keyword in keyword_repo.get(reponame, {}).keys():
 
             if keyword not in mykeywords:
                 continue
@@ -8068,7 +8068,8 @@ class EntropyRepository:
 
         # if we get here, it means we didn't find a match in repositories
         # so we scan packages, last chance
-        for keyword in keyword_pkg:
+        for keyword in keyword_pkg.keys():
+            # use .keys() because keyword_pkg gets modified during iteration
 
             # first of all check if keyword is in mykeywords
             if keyword not in mykeywords: