diff --git a/js/lib/components/Badge.js b/js/lib/components/Badge.js
index 2b42489b8..50fa830cc 100644
--- a/js/lib/components/Badge.js
+++ b/js/lib/components/Badge.js
@@ -24,11 +24,6 @@ export default class Badge extends Component {
     attrs.className = 'Badge ' + (type ? 'Badge--' + type : '') + ' ' + (attrs.className || '');
     attrs.title = extract(attrs, 'label') || '';
 
-    // Give the badge a unique key so that when badges are displayed together,
-    // and then one is added/removed, Mithril will correctly redraw the series
-    // of badges.
-    attrs.key = attrs.type;
-
     return (
       <span {...attrs}>
         {iconName ? icon(iconName, {className: 'Badge-icon'}) : m.trust('&nbsp;')}
diff --git a/js/lib/helpers/listItems.js b/js/lib/helpers/listItems.js
index 133472d60..7dc3b7469 100644
--- a/js/lib/helpers/listItems.js
+++ b/js/lib/helpers/listItems.js
@@ -41,7 +41,8 @@ export default function listItems(items) {
             (item.itemName ? 'item-' + item.itemName : ''),
             className,
             (active ? 'active' : '')
-          ])}>
+          ])}
+            key={item.itemName}>
             {item}
           </li>,
       ' '