diff --git a/common/content/abbreviations.js b/common/content/abbreviations.js
index 0ca49cba..3caabab7 100644
--- a/common/content/abbreviations.js
+++ b/common/content/abbreviations.js
@@ -216,8 +216,9 @@ const Abbreviations = Module("abbreviations", {
 }, {
     completion: function () {
         completion.abbreviation = function abbreviation(context, modes) {
-            let abbrevs = abbreviations.merged.filter(function (abbr) abbr.inModes(modes));
-            context.completions = [[abbr.lhs, abbr.rhs] for ([, abbr] in Iterator(abbrevs))];
+            let fn = modes ? function (abbr) abbr.inModes(modes) : util.identity;
+            context.keys = { text: "lhs" , description: "rhs" };
+            context.completions = abbreviations.merged.filter(fn);
         };
     },