diff --git a/src/components/message/EmojiPicker.tsx b/src/components/message/EmojiPicker.tsx
new file mode 100644
index 0000000..14c9fde
--- /dev/null
+++ b/src/components/message/EmojiPicker.tsx
@@ -0,0 +1,42 @@
+import React, { FC } from 'react'
+import data from '@emoji-mart/data'
+import Picker from '@emoji-mart/react'
+import { Emoji } from './Emoji'
+import { Box, IconButton, Popper } from '@mui/material'
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
+import { faSmile } from '@fortawesome/free-solid-svg-icons'
+import palette from '../../theme/palette'
+
+interface Props {
+  onChange: (emoji: Emoji) => void
+}
+
+const EmojiPicker: FC<Props> = ({ onChange }) => {
+  const [anchorEl, setAnchorEl] = React.useState<null | HTMLElement>(null)
+
+  const handleChange = (emoji: Emoji) => {
+    onChange(emoji)
+    setAnchorEl(null)
+  }
+
+  const handleClick = (event: React.MouseEvent<HTMLElement>) => {
+    setAnchorEl(anchorEl ? null : event.currentTarget)
+    event.stopPropagation()
+  }
+
+  const open = Boolean(anchorEl)
+  const id = open ? 'simple-popper' : undefined
+
+  return (
+    <Box>
+      <IconButton component="span" onClick={handleClick} style={{ marginRight: '8px' }}>
+        <FontAwesomeIcon color={palette.primary['main']} icon={faSmile} size="xs" />
+      </IconButton>
+      <Popper anchorEl={anchorEl} id={id} open={open}>
+        <Picker data={data} onClickOutside={() => setAnchorEl(null)} onEmojiSelect={handleChange} theme="light" />
+      </Popper>
+    </Box>
+  )
+}
+
+export default EmojiPicker
diff --git a/src/components/message/EmojiPickerModal.tsx b/src/components/message/EmojiPickerModal.tsx
deleted file mode 100644
index 9de43b1..0000000
--- a/src/components/message/EmojiPickerModal.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import React, { FC } from 'react'
-import Modal from '../common/Modal'
-import data from '@emoji-mart/data'
-import Picker from '@emoji-mart/react'
-import { Emoji } from './Emoji'
-
-interface Props {
-  open: boolean
-  onClose: () => void
-  onChange: (emoji: Emoji) => void
-}
-
-const EmojiPickerModal: FC<Props> = ({ open, onClose, onChange }) => {
-  const handleChange = (emoji: Emoji) => {
-    onChange(emoji)
-    onClose()
-  }
-
-  return (
-    <Modal dialogContentSx={{ px: 0 }} onClose={onClose} open={open} title="Insert emoji">
-      <Picker data={data} onClickOutside={() => onClose} onEmojiSelect={handleChange} />
-    </Modal>
-  )
-}
-
-export default EmojiPickerModal
diff --git a/src/components/message/MessageForm.tsx b/src/components/message/MessageForm.tsx
index 1999693..31a05a1 100644
--- a/src/components/message/MessageForm.tsx
+++ b/src/components/message/MessageForm.tsx
@@ -8,12 +8,12 @@ import useAuth from '../useAuth'
 import { Upload } from '../../api/Upload'
 import UploadButton from './UploadButton'
 import AttachmentsPreview from './AttachmentsPreview'
-import EmojiPickerModal from './EmojiPickerModal'
+import EmojiPicker from './EmojiPicker'
 import MessageMapModal from './MessageMapModal'
 import { FeatureCollection, Geometry } from 'geojson'
 import { Box, Button, FormGroup, IconButton, Stack, TextField } from '@mui/material'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
-import { faMapLocationDot, faPaperPlane, faSmile } from '@fortawesome/free-solid-svg-icons'
+import { faMapLocationDot, faPaperPlane } from '@fortawesome/free-solid-svg-icons'
 import palette from '../../theme/palette'
 import { Emoji } from './Emoji'
 
@@ -40,7 +40,6 @@ const MessageForm: FC<Props> = ({ ticker }) => {
   const [isSubmitting, setIsSubmitting] = useState<boolean>(false)
   const [attachments, setAttachments] = useState<Upload[]>([])
   const [mapDialogOpen, setMapDialogOpen] = useState<boolean>(false)
-  const [emojiPickerOpen, setEmojiPickerOpen] = useState<boolean>(false)
   const emptyMap: FeatureCollection<Geometry, any> = {
     type: 'FeatureCollection',
     features: [],
@@ -130,19 +129,16 @@ const MessageForm: FC<Props> = ({ ticker }) => {
         />
       </FormGroup>
       <Stack alignItems="center" direction="row" justifyContent="space-between">
-        <Box>
+        <Box display="flex">
           <Button disabled={isSubmitting} startIcon={<FontAwesomeIcon icon={faPaperPlane} />} sx={{ mr: 1 }} type="submit" variant="outlined">
             Send
           </Button>
-          <IconButton component="span" onClick={() => setEmojiPickerOpen(true)} style={{ marginRight: '8px' }}>
-            <FontAwesomeIcon color={palette.primary['main']} icon={faSmile} size="xs" />
-          </IconButton>
+          <EmojiPicker onChange={onSelectEmoji} />
           <UploadButton onUpload={onUpload} ticker={ticker} />
           <IconButton component="span" onClick={() => setMapDialogOpen(true)}>
             <FontAwesomeIcon color={palette.primary['main']} icon={faMapLocationDot} size="xs" />
           </IconButton>
           <MessageMapModal map={map} onChange={onMapUpdate} onClose={() => setMapDialogOpen(false)} open={mapDialogOpen} ticker={ticker} />
-          <EmojiPickerModal onChange={onSelectEmoji} onClose={() => setEmojiPickerOpen(false)} open={emojiPickerOpen} />
         </Box>
         <MessageFormCounter letterCount={message?.length || 0} maxLength={maxLength} />
       </Stack>