diff --git a/files/assets/js/gif_modal.js b/files/assets/js/gif_modal.js
index 00c56d039..b2acab6d7 100644
--- a/files/assets/js/gif_modal.js
+++ b/files/assets/js/gif_modal.js
@@ -106,7 +106,6 @@ async function getGifs(form) {
 }
 
 document.getElementById('gifs-back-btn').onclick = getGifs;
-document.getElementById('gifs-cancel-btn').onclick = getGifs;
 
 async function searchGifs(searchTerm) {
 
diff --git a/files/templates/modals/gif.html b/files/templates/modals/gif.html
index 48e2c1a7c..ae73244e6 100644
--- a/files/templates/modals/gif.html
+++ b/files/templates/modals/gif.html
@@ -5,7 +5,7 @@
 				<div class="form-group d-flex align-items-center w-100 mb-0">
 					<div id="gifs-back-btn"><button class="btn btn-link mx-2" id="gifs-back-btn"><i class="fas fa-long-arrow-left text-muted"></i></button></div>
 					<input autocomplete="off" type="text" class="form-control" id="gifSearch" placeholder="Search and press enter">
-					<div id="gifs-cancel-btn"><button class="btn btn-link mx-2" id="gifs-cancel-btn"><i class="fas fa-times text-muted"></i></button></div>
+					<button class="btn btn-link mx-2" data-bs-dismiss="modal"><i class="fas fa-times text-muted"></i></button>
 				</div>
 			</div>
 			<div style="overflow-y: auto;">