diff --git a/files/assets/css/main.css b/files/assets/css/main.css
index edbdace17..9b91597eb 100644
--- a/files/assets/css/main.css
+++ b/files/assets/css/main.css
@@ -5570,7 +5570,7 @@ code {
 	cursor: pointer !important;
 }
 
-.disable-sort-click {
+.disable-sort-click:not(.sorting) {
 	cursor: default !important;
 }
 
diff --git a/files/templates/emojis.html b/files/templates/emojis.html
index 509c11318..3e60d343c 100644
--- a/files/templates/emojis.html
+++ b/files/templates/emojis.html
@@ -23,16 +23,16 @@
 		<table class="datatable d-none">
 			<thead>
 				<tr>
-					<th>#</th>
-					<th>Name</th>
-					<th>Emoji</th>
-					<th>Usage</th>
-					<th>Author</th>
-					<th>Added on</th>
+					<th class="disable-sort-click">#</th>
+					<th class="disable-sort-click">Name</th>
+					<th class="disable-sort-click">Emoji</th>
+					<th class="disable-sort-click">Usage</th>
+					<th class="disable-sort-click">Author</th>
+					<th class="disable-sort-click">Added on</th>
 					{% if FEATURES['EMOJI_SUBMISSIONS'] %}
 						<th class="disable-sort-click">Original File</th>
 					{% endif %}
-					<th>Tags</th>
+					<th class="disable-sort-click">Tags</th>
 				</tr>
 			</thead>
 			<tbody>
@@ -50,7 +50,7 @@
 							{% include "user_in_table.html" %}
 						{% endif %}
 					</td>
-					<td data-sort-key="{{emoji.created_utc}}" {% if emoji.created_utc %}data-time="{{emoji.created_utc}}"{% endif %}></td>
+					<td data-sort="{{emoji.created_utc}}" {% if emoji.created_utc %}data-time="{{emoji.created_utc}}"{% endif %}></td>
 					{% if FEATURES['EMOJI_SUBMISSIONS'] %}
 						<td>
 							{% if emoji.og %}
diff --git a/files/templates/hats.html b/files/templates/hats.html
index 01f937fe9..07431338f 100644
--- a/files/templates/hats.html
+++ b/files/templates/hats.html
@@ -44,15 +44,15 @@
 			<thead>
 				<tr>
 					<th class="disable-sort-click">Hat</th>
-					<th>Name</th>
-					<th>Description</th>
+					<th class="disable-sort-click">>Name</th>
+					<th class="disable-sort-click">>Description</th>
 					{% if SITE == 'rdrama.net' %}
-						<th>Author</a></th>
+						<th class="disable-sort-click">>Author</a></th>
 					{% endif %}
-					<th>Owners</th>
-					<th>Price</th>
+					<th class="disable-sort-click">>Owners</th>
+					<th class="disable-sort-click">>Price</th>
 					<th class="disable-sort-click">Actions</th>
-					<th>Added on</th>
+					<th class="disable-sort-click">>Added on</th>
 				</tr>
 			</thead>
 
@@ -86,7 +86,7 @@
 							</div>
 						</td>
 
-						<td data-time="{{hat.created_utc}}"></td>
+						<td data-sort="{{hat.created_utc}}" data-time="{{hat.created_utc}}"></td>
 					</tr>
 				{% endfor %}
 			</tbody>