diff --git a/files/templates/default.html b/files/templates/default.html
index b43444dc0..b814f032e 100644
--- a/files/templates/default.html
+++ b/files/templates/default.html
@@ -330,7 +330,7 @@
 <script src="/assets/js/lite-youtube.js?v=1"></script>
 
 <script src="/assets/js/gif_modal.js?v=54"></script>
-<script src="/assets/js/emoji_modal.js?v=139"></script>
+<script src="/assets/js/emoji_modal.js?v=140"></script>
 
 {% if v %}
 	<script>function formkey() {return '{{v.formkey}}';}</script>
diff --git a/files/templates/emoji_modal.html b/files/templates/emoji_modal.html
index e6399bf29..571c7d8f7 100644
--- a/files/templates/emoji_modal.html
+++ b/files/templates/emoji_modal.html
@@ -4,7 +4,7 @@
 		<div class="modal-content" id="emojiTabs">
 			<div class="modal-header">
 				<div>
-					<ul class="nav nav-pills py-2">
+					<ul class="nav-pills flex flex-wrap mb-0 py-2">
 						<li class="nav-item">
 							<a class="nav-link active emojitab" data-bs-toggle="tab" href="#emoji-tab-favorite">Favorite</a>
 						</li>
@@ -39,7 +39,9 @@
 				</button>
 			</div>
 
-			<div class="px-3"><input class="form-control px-2" type="text" id="emoji_search" placeholder="Search.."></div>
+			<div class="px-3">
+				<input class="form-input" type="text" id="emoji_search" placeholder="Search emoji..">
+			</div>
 
 			<div style="overflow-y: scroll;">
 				<div class="modal-body p-0" id="emoji-modal-body">