diff --git a/files/helpers/jinja2.py b/files/helpers/jinja2.py
index a76fa2afc..5316b40dd 100644
--- a/files/helpers/jinja2.py
+++ b/files/helpers/jinja2.py
@@ -27,7 +27,7 @@ def favorite_emojis(x):
 	str = ""
 	emojis = sorted(x.items(), key=lambda x: x[1], reverse=True)[:25]
 	for k, v in emojis:
-		str += f'<button class="btn m-1 px-0" onclick="getEmoji(\'{k}\', \'@form@\')" style="background: None!important; width:60px; overflow: hidden; border: none;" data-bs-toggle="tooltip" title=":{k}:" delay:="0"><img loading="lazy" width=50 src="/assets/images/emojis/{k}.webp" alt="{k}-emoji"/></button>'
+		str += f'<button class="btn m-1 px-0 emoji" onclick="getEmoji(\'{k}\', \'@form@\')" style="background: None!important; width:60px; overflow: hidden; border: none;" data-bs-toggle="tooltip" title=":{k}:" delay:="0"><img loading="lazy" width=50 src="/assets/images/emojis/{k}.webp" alt="{k}-emoji"/></button>'
 	return str
 
 @app.context_processor
diff --git a/files/templates/emoji_modal.html b/files/templates/emoji_modal.html
index 85399196f..a1e3adc22 100644
--- a/files/templates/emoji_modal.html
+++ b/files/templates/emoji_modal.html
@@ -11,6 +11,9 @@
 			margin: 1.75rem auto !important;
 		}
 	}
+	.emoji:focus {
+		border: 1px solid #805ad5 !important;
+	}
 </style>
 
 <script>
@@ -98,7 +101,7 @@
 
 				for (j=0; j < arr.length; j++) {
 					if(arr[j].match(search_bar.value)){
-						str += `<button class="btn m-1 px-0" onclick="getEmoji(\'${arr[j]}\', \'${form}\')" style="background: None!important; width:60px; overflow: hidden; border: none;" data-bs-toggle="tooltip" title=":${arr[j]}:" delay:="0"><img loading="lazy" width=50 src="/assets/images/emojis/${arr[j]}.webp" alt="${arr[j]}-emoji"/></button>`;
+						str += `<button class="btn m-1 px-0 emoji" onclick="getEmoji(\'${arr[j]}\', \'${form}\')" style="background: None!important; width:60px; overflow: hidden; border: none;" data-bs-toggle="tooltip" title=":${arr[j]}:" delay:="0"><img loading="lazy" width=50 src="/assets/images/emojis/${arr[j]}.webp" alt="${arr[j]}-emoji"/></button>`;
 					}
 				}
 
@@ -112,7 +115,7 @@
 				let container = document.getElementById(`EMOJIS_${emojis[i].type}`)
 				for (j=0; j < arr.length; j++) {
 					if(arr[j].match(search_bar.value.toLowerCase())){
-					str += `<button class="btn m-1 px-0" onclick="getEmoji(\'${arr[j]}\', \'${form}\')" style="background: None!important; width:60px; overflow: hidden; border: none;" data-bs-toggle="tooltip" title=":${arr[j]}:" delay:="0"><img loading="lazy" width=50 src="/assets/images/emojis/${arr[j]}.webp" alt="${arr[j]}-emoji"/></button>`;
+					str += `<button class="btn m-1 px-0 emoji" onclick="getEmoji(\'${arr[j]}\', \'${form}\')" style="background: None!important; width:60px; overflow: hidden; border: none;" data-bs-toggle="tooltip" title=":${arr[j]}:" delay:="0"><img loading="lazy" width=50 src="/assets/images/emojis/${arr[j]}.webp" alt="${arr[j]}-emoji"/></button>`;
 					}
 				}
 				container.innerHTML = ""