diff --git a/common/script/content.coffee b/common/script/content.coffee
index da39a203a3..7416bd8948 100644
--- a/common/script/content.coffee
+++ b/common/script/content.coffee
@@ -559,7 +559,10 @@ api.potion =
 api.armoire =
   type: 'armoire',
   text: t('armoireText'),
-  notes: t('armoireNotesEmpty'),
+  notes: ((user, count)->
+    return t('armoireNotesEmpty')() if (user.flags.armoireEmpty)
+    return t('armoireNotesFull')() + count
+  ),
   value: 100,
   key: 'armoire',
   canOwn: ((u)-> _.contains(u.achievements.ultimateGearSets, true))
diff --git a/website/views/shared/tasks/task_view/static_rewards.jade b/website/views/shared/tasks/task_view/static_rewards.jade
index 7fad52176c..3ce7ab78b8 100644
--- a/website/views/shared/tasks/task_view/static_rewards.jade
+++ b/website/views/shared/tasks/task_view/static_rewards.jade
@@ -19,4 +19,5 @@ mixin reward(item)
 ul.items.rewards(ng-if='main && list.type=="reward"')
   +reward('item')(ng-repeat='item in itemStore')
   +reward('healthPotion')
-  +reward('armoire')(ng-if='user.flags.armoireEnabled')
+  +reward('armoire')(ng-if='user.flags.armoireEnabled',
+    popover='{{armoire.notes(user, armoireCount(user.items.gear.owned))}}')