diff --git a/BaseClasses.py b/BaseClasses.py
index 9ce34fd6..82f63765 100644
--- a/BaseClasses.py
+++ b/BaseClasses.py
@@ -120,6 +120,15 @@ class World(object):
                         ret.prog_items.append('Titans Mitts')
                     else:
                         ret.prog_items.append('Power Glove')
+                elif 'Shield' in item.name:
+                    if ret.has('Mirror Shield'):
+                        pass
+                    elif ret.has('Red Shield'):
+                        ret.prog_items.append('Mirror Shield')
+                    elif ret.has('Blue Shield'):
+                        ret.prog_items.append('Red Shield')
+                    else:
+                        ret.prog_items.append('Blue Shield')
 
             elif item.advancement or item.key:
                 ret.prog_items.append(item.name)