diff --git a/addons/mail/static/src/js/field_char_emojis.js b/addons/mail/static/src/js/field_char_emojis.js
new file mode 100644
index 00000000000..012a68c2ead
--- /dev/null
+++ b/addons/mail/static/src/js/field_char_emojis.js
@@ -0,0 +1,18 @@
+odoo.define('mail.field_char_emojis', function (require) {
+"use strict";
+
+var basicFields = require('web.basic_fields');
+var registry = require('web.field_registry');
+var FieldEmojiCommon = require('mail.field_emojis_common');
+var MailEmojisMixin = require('mail.emoji_mixin');
+
+/**
+ * Extension of the FieldChar that will add emojis support
+ */
+var FieldCharEmojis = basicFields.FieldChar.extend(MailEmojisMixin, FieldEmojiCommon);
+
+registry.add('char_emojis', FieldCharEmojis);
+
+return FieldCharEmojis;
+
+});
diff --git a/addons/mail/static/src/js/text_emojis_fields.js b/addons/mail/static/src/js/field_emojis_common.js
similarity index 86%
rename from addons/mail/static/src/js/text_emojis_fields.js
rename to addons/mail/static/src/js/field_emojis_common.js
index 21a94032168..79215ac7329 100644
--- a/addons/mail/static/src/js/text_emojis_fields.js
+++ b/addons/mail/static/src/js/field_emojis_common.js
@@ -1,10 +1,9 @@
-odoo.define('mail.text_emojis_field', function (require) {
+odoo.define('mail.field_emojis_common', function (require) {
 "use strict";
 
 var basicFields = require('web.basic_fields');
 var core = require('web.core');
 var emojis = require('mail.emojis');
-var registry = require('web.field_registry');
 var MailEmojisMixin = require('mail.emoji_mixin');
 var _onEmojiClickMixin = MailEmojisMixin._onEmojiClick;
 var QWeb = core.qweb;
@@ -132,19 +131,6 @@ var FieldEmojiCommon = {
     }
 };
 
-/**
- * Extension of the FieldText that will add emojis support
- */
-var FieldTextEmojis = basicFields.FieldText.extend(MailEmojisMixin, FieldEmojiCommon);
-
-/**
- * Extension of the FieldChar that will add emojis support
- */
-var FieldCharEmojis = basicFields.FieldChar.extend(MailEmojisMixin, FieldEmojiCommon);
-
-registry.add('text_emojis', FieldTextEmojis);
-registry.add('char_emojis', FieldCharEmojis);
-
-return {FieldTextEmojis: FieldTextEmojis, FieldCharEmojis: FieldCharEmojis, FieldEmojiCommon: FieldEmojiCommon};
+return FieldEmojiCommon;
 
 });
diff --git a/addons/mail/static/src/js/field_text_emojis.js b/addons/mail/static/src/js/field_text_emojis.js
new file mode 100644
index 00000000000..8ed14ecfa03
--- /dev/null
+++ b/addons/mail/static/src/js/field_text_emojis.js
@@ -0,0 +1,18 @@
+odoo.define('mail.field_text_emojis', function (require) {
+"use strict";
+
+var basicFields = require('web.basic_fields');
+var registry = require('web.field_registry');
+var FieldEmojiCommon = require('mail.field_emojis_common');
+var MailEmojisMixin = require('mail.emoji_mixin');
+
+/**
+ * Extension of the FieldText that will add emojis support
+ */
+var FieldTextEmojis = basicFields.FieldText.extend(MailEmojisMixin, FieldEmojiCommon);
+
+registry.add('text_emojis', FieldTextEmojis);
+
+return FieldTextEmojis;
+
+});
diff --git a/addons/mail/views/assets.xml b/addons/mail/views/assets.xml
index 4b1877277e0..e3dd42c366e 100644
--- a/addons/mail/views/assets.xml
+++ b/addons/mail/views/assets.xml
@@ -38,7 +38,9 @@
                 <!-- Emojis -->
                 <script type="text/javascript" src="/mail/static/src/js/emojis.js"></script>
                 <script type="text/javascript" src="/mail/static/src/js/emojis_mixin.js"/>
-                <script type="text/javascript" src="/mail/static/src/js/text_emojis_fields.js"/>
+                <script type="text/javascript" src="/mail/static/src/js/field_emojis_common.js"/>
+                <script type="text/javascript" src="/mail/static/src/js/field_char_emojis.js"/>
+                <script type="text/javascript" src="/mail/static/src/js/field_text_emojis.js"/>
                 <link rel="stylesheet" type="text/scss" href="/mail/static/src/scss/emojis.scss"/>
                 <!-- Others -->