diff --git a/src/components/EmojiPicker/EmojiPickerMenu/index.js b/src/components/EmojiPicker/EmojiPickerMenu/index.js
index 4fe540bcc813..21ec2d724f15 100755
--- a/src/components/EmojiPicker/EmojiPickerMenu/index.js
+++ b/src/components/EmojiPicker/EmojiPickerMenu/index.js
@@ -256,6 +256,9 @@ class EmojiPickerMenu extends Component {
             const isHeader = e => e.header || e.spacer;
             do {
                 newIndex += steps;
+                if (newIndex < 0) {
+                    break;
+                }
             } while (isHeader(this.state.filteredEmojis[newIndex]));
         };