diff --git a/assets/js/components/emoji/parser.js b/assets/js/components/emoji/parser.js
index 4649c407..7ecd4d31 100644
--- a/assets/js/components/emoji/parser.js
+++ b/assets/js/components/emoji/parser.js
@@ -29,7 +29,7 @@ ComunicWeb.components.emoji.parser = {
 	parse: function(info){
 
 		//Peform string parsing
-		info.element.innerHTML = this.shorcutToHTMLcode(info.element.innerHTML);
+		info.element.innerHTML = this.shortcutToHTMLcode(info.element.innerHTML);
 
 		// Parse custom semicolons
 		if(info.user)
@@ -84,12 +84,12 @@ ComunicWeb.components.emoji.parser = {
 	},
 
 	/**
-	 * Perform shorcut emoji to HTML code parsing
+	 * Perform shortcut emoji to HTML code parsing
 	 * 
 	 * @param {String} string The input string
 	 * @return {String} The output string
 	 */
-	shorcutToHTMLcode: function(string){
+	shortcutToHTMLcode: function(string){
 
 		//Process all emojie list
 		var i;
@@ -113,7 +113,7 @@ ComunicWeb.components.emoji.parser = {
 	 */
 	parseCustomEmojis: function(user, input) {
 		for(const e  of user.customEmojis) {
-			input = input.replace(new RegExp(e.shorcut, "g"), "<img src='"+e.url+"' class='emoji' alt='"+e.shorcut+"' title='"+e.shorcut+"'/>")
+			input = input.replace(new RegExp(e.shortcut, "g"), "<img src='"+e.url+"' class='emoji' alt='"+e.shortcut+"' title='"+e.shortcut+"'/>")
 		}
 
 		return input
diff --git a/assets/js/pages/settings/sections/emojis.js b/assets/js/pages/settings/sections/emojis.js
index eb6c9cce..28da5260 100644
--- a/assets/js/pages/settings/sections/emojis.js
+++ b/assets/js/pages/settings/sections/emojis.js
@@ -72,7 +72,7 @@ class EmojiesSection {
 
 
 				line.innerHTML += "<td><img class='e' src='"+e.url+"' /></td>" +
-					"<td>"+e.shorcut+"</td><td></td>" 
+					"<td>"+e.shortcut+"</td><td></td>" 
 				
 
 				// Add delete button