diff --git a/src/components/emoji-input/emoji-input.js b/src/components/emoji-input/emoji-input.js
index ddabcf3a..62c58446 100644
--- a/src/components/emoji-input/emoji-input.js
+++ b/src/components/emoji-input/emoji-input.js
@@ -1,5 +1,5 @@
 import Completion from '../../services/completion/completion.js'
-import EmojiSelector from '../emoji-selector/emoji-selector.vue'
+import EmojiPicker from '../emoji-picker/emoji-picker.vue'
 import { take } from 'lodash'
 
 /**
@@ -65,7 +65,7 @@ const EmojiInput = {
     }
   },
   components: {
-    EmojiSelector
+    EmojiPicker
   },
   computed: {
     suggestions () {
diff --git a/src/components/emoji-selector/emoji-selector.js b/src/components/emoji-picker/emoji-picker.js
similarity index 97%
rename from src/components/emoji-selector/emoji-selector.js
rename to src/components/emoji-picker/emoji-picker.js
index 969b880b..9d2595aa 100644
--- a/src/components/emoji-selector/emoji-selector.js
+++ b/src/components/emoji-picker/emoji-picker.js
@@ -2,7 +2,7 @@ const filterByKeyword = (list, keyword = '') => {
   return list.filter(x => x.shortcode.indexOf(keyword) !== -1)
 }
 
-const EmojiSelector = {
+const EmojiPicker = {
   mounted () {
     document.body.addEventListener('click', this.outsideClicked)
   },
@@ -69,4 +69,4 @@ const EmojiSelector = {
   }
 }
 
-export default EmojiSelector
+export default EmojiPicker
diff --git a/src/components/emoji-selector/emoji-selector.vue b/src/components/emoji-picker/emoji-picker.vue
similarity index 98%
rename from src/components/emoji-selector/emoji-selector.vue
rename to src/components/emoji-picker/emoji-picker.vue
index 0630772c..663d9e2e 100644
--- a/src/components/emoji-selector/emoji-selector.vue
+++ b/src/components/emoji-picker/emoji-picker.vue
@@ -33,7 +33,7 @@
   </div>
 </template>
 
-<script src="./emoji-selector.js"></script>
+<script src="./emoji-picker.js"></script>
 
 <style lang="scss">
 @import '../../_variables.scss';
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index 5aaac8e6..3e1b83b5 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -2,7 +2,7 @@ import statusPoster from '../../services/status_poster/status_poster.service.js'
 import MediaUpload from '../media_upload/media_upload.vue'
 import ScopeSelector from '../scope_selector/scope_selector.vue'
 import EmojiInput from '../emoji-input/emoji-input.vue'
-import EmojiSelector from '../emoji-selector/emoji-selector.vue'
+import EmojiPicker from '../emoji-picker/emoji-picker.vue'
 import PollForm from '../poll/poll_form.vue'
 import StickerPicker from '../sticker_picker/sticker_picker.vue'
 import fileTypeService from '../../services/file_type/file_type.service.js'