diff --git a/core/prelude-osx.el b/core/prelude-osx.el
index 2120998..397a83c 100644
--- a/core/prelude-osx.el
+++ b/core/prelude-osx.el
@@ -66,5 +66,8 @@ Windows external keyboard from time to time."
 
 (menu-bar-mode +1)
 
+;; Enable emoji, and stop the UI from freezing when trying to display them.
+(set-fontset-font t 'unicode "Apple Color Emoji" nil 'prepend)
+
 (provide 'prelude-osx)
 ;;; prelude-osx.el ends here