diff --git a/packages/emoji-mart/src/components/Picker/Picker.tsx b/packages/emoji-mart/src/components/Picker/Picker.tsx
index 24cad2e6..ec34a6a4 100644
--- a/packages/emoji-mart/src/components/Picker/Picker.tsx
+++ b/packages/emoji-mart/src/components/Picker/Picker.tsx
@@ -607,7 +607,13 @@ export default class Picker extends Component {
   }
 
   handleCategoryClick = ({ category, i }) => {
-    this.scrollTo(i == 0 ? { row: -1 } : { categoryId: category.id })
+    if (this.state.searchResults) {
+      this.clearSearch()
+    }
+    this.unfocusSearch()
+    setTimeout(() => {
+      this.scrollTo(i == 0 ? { row: -1 } : { categoryId: category.id })
+    })
   }
 
   handleEmojiOver(pos) {