diff --git a/app/assets/javascripts/discourse/helpers/grouped-each.js.es6 b/app/assets/javascripts/discourse/helpers/grouped-each.js.es6
index b40b6706b02..b8d80ff400a 100644
--- a/app/assets/javascripts/discourse/helpers/grouped-each.js.es6
+++ b/app/assets/javascripts/discourse/helpers/grouped-each.js.es6
@@ -82,12 +82,8 @@ DiscourseGroupedEach.prototype = {
     for (var i = 0; i < contentLength; i++) {
       var row = content.objectAt(i);
       if (keyword) {
-        var keywords = Em.get(data, 'keywords');
-        if (!keywords) {
-          keywords = {};
-          Em.set(data, 'keywords', keywords);
-        }
-        Em.set(keywords, keyword, row);
+        data.keywords = data.keywords || {};
+        data.keywords[keyword] = row;
       }
       template(row, { data: data });
     }