diff --git a/app/soapbox/components/__tests__/__snapshots__/emoji_selector-test.js.snap b/app/soapbox/components/__tests__/__snapshots__/emoji_selector-test.js.snap
index 17833fc33..06d7764ec 100644
--- a/app/soapbox/components/__tests__/__snapshots__/emoji_selector-test.js.snap
+++ b/app/soapbox/components/__tests__/__snapshots__/emoji_selector-test.js.snap
@@ -19,7 +19,7 @@ exports[`<EmojiSelector /> renders correctly 1`] = `
         }
       }
       onClick={[Function]}
-      onKeyUp={[Function]}
+      onKeyDown={[Function]}
       tabIndex={-1}
     />
     <button
@@ -30,7 +30,7 @@ exports[`<EmojiSelector /> renders correctly 1`] = `
         }
       }
       onClick={[Function]}
-      onKeyUp={[Function]}
+      onKeyDown={[Function]}
       tabIndex={-1}
     />
     <button
@@ -41,7 +41,7 @@ exports[`<EmojiSelector /> renders correctly 1`] = `
         }
       }
       onClick={[Function]}
-      onKeyUp={[Function]}
+      onKeyDown={[Function]}
       tabIndex={-1}
     />
     <button
@@ -52,7 +52,7 @@ exports[`<EmojiSelector /> renders correctly 1`] = `
         }
       }
       onClick={[Function]}
-      onKeyUp={[Function]}
+      onKeyDown={[Function]}
       tabIndex={-1}
     />
     <button
@@ -63,7 +63,7 @@ exports[`<EmojiSelector /> renders correctly 1`] = `
         }
       }
       onClick={[Function]}
-      onKeyUp={[Function]}
+      onKeyDown={[Function]}
       tabIndex={-1}
     />
     <button
@@ -74,7 +74,7 @@ exports[`<EmojiSelector /> renders correctly 1`] = `
         }
       }
       onClick={[Function]}
-      onKeyUp={[Function]}
+      onKeyDown={[Function]}
       tabIndex={-1}
     />
   </div>
diff --git a/app/soapbox/components/emoji_selector.js b/app/soapbox/components/emoji_selector.js
index 572f63a86..b47166228 100644
--- a/app/soapbox/components/emoji_selector.js
+++ b/app/soapbox/components/emoji_selector.js
@@ -35,21 +35,38 @@ class EmojiSelector extends ImmutablePureComponent {
     }
   }
 
-  handleKeyUp = i => e => {
+  _selectPreviousEmoji = i => {
+    if (i !== 0) {
+      this.node.querySelector(`.emoji-react-selector__emoji:nth-child(${i})`).focus();
+    } else {
+      this.node.querySelector('.emoji-react-selector__emoji:last-child').focus();
+    }
+  };
+
+  _selectNextEmoji = i => {
+    if (i !== this.props.allowedEmoji.size - 1) {
+      this.node.querySelector(`.emoji-react-selector__emoji:nth-child(${i + 2})`).focus();
+    } else {
+      this.node.querySelector('.emoji-react-selector__emoji:first-child').focus();
+    }
+  };
+
+  handleKeyDown = i => e => {
     const { onUnfocus } = this.props;
 
     switch (e.key) {
+    case 'Tab':
+      e.preventDefault();
+      if (e.shiftKey) this._selectPreviousEmoji(i);
+      else this._selectNextEmoji(i);
+      break;
     case 'Left':
     case 'ArrowLeft':
-      if (i !== 0) {
-        this.node.querySelector(`.emoji-react-selector__emoji:nth-child(${i})`).focus();
-      }
+      this._selectPreviousEmoji(i);
       break;
     case 'Right':
     case 'ArrowRight':
-      if (i !== this.props.allowedEmoji.size - 1) {
-        this.node.querySelector(`.emoji-react-selector__emoji:nth-child(${i + 2})`).focus();
-      }
+      this._selectNextEmoji(i);
       break;
     case 'Escape':
       onUnfocus();
@@ -94,7 +111,7 @@ class EmojiSelector extends ImmutablePureComponent {
               className='emoji-react-selector__emoji'
               dangerouslySetInnerHTML={{ __html: emojify(emoji) }}
               onClick={this.handleReact(emoji)}
-              onKeyUp={this.handleKeyUp(i, emoji)}
+              onKeyDown={this.handleKeyDown(i, emoji)}
               tabIndex={(visible || focused) ? 0 : -1}
             />
           ))}