diff --git a/css/emoji-mart.css b/css/emoji-mart.css
index d2e4a65..c8d28f9 100644
--- a/css/emoji-mart.css
+++ b/css/emoji-mart.css
@@ -160,6 +160,18 @@
   background-color: rgba(255, 255, 255, .95);
 }
 
+.emoji-mart-category-list {
+  margin: 0;
+  padding: 0;
+}
+
+.emoji-mart-category-list li {
+  list-style: none;
+  margin: 0;
+  padding: 0;
+  display: inline-block;
+}
+
 .emoji-mart-emoji {
   position: relative;
   display: inline-block;
diff --git a/src/components/category.js b/src/components/category.js
index 21556ca..4368c11 100644
--- a/src/components/category.js
+++ b/src/components/category.js
@@ -195,10 +195,15 @@ export default class Category extends React.Component {
           </span>
         </div>
 
+        <ul className="emoji-mart-category-list">
         {emojis &&
-          emojis.map((emoji) =>
-            NimbleEmoji({ emoji: emoji, data: this.data, ...emojiProps }),
+          emojis.map((emoji) => (
+              <li key={emoji.id || emoji}>
+                {NimbleEmoji({ emoji: emoji, data: this.data, ...emojiProps })}
+              </li>
+            )
           )}
+        </ul>
 
         {emojis &&
           !emojis.length && (
diff --git a/src/components/emoji/nimble-emoji.js b/src/components/emoji/nimble-emoji.js
index 23ad4cd..13f6017 100644
--- a/src/components/emoji/nimble-emoji.js
+++ b/src/components/emoji/nimble-emoji.js
@@ -185,7 +185,6 @@ const NimbleEmoji = (props) => {
   } else {
     return (
       <button
-        key={props.emoji.id || props.emoji}
         onClick={(e) => _handleClick(e, props)}
         onMouseEnter={(e) => _handleOver(e, props)}
         onMouseLeave={(e) => _handleLeave(e, props)}