diff --git a/apps/static/js/tickets.js b/apps/static/js/tickets.js
index 4872240..8265139 100644
--- a/apps/static/js/tickets.js
+++ b/apps/static/js/tickets.js
@@ -157,33 +157,29 @@ function applyTicketClickFunction() {
     $(".ticket-item").on("click", function(e) {
         e.preventDefault();
         loadTicketContent($(this).data("uuid"));
+        $(".ticket-item").removeClass("active");
+        $(this).addClass("active");
         $('.email-app').removeClass('side-active');
         $('.email-content').toggleClass('open');
     });
 }
 
 function reloadCurrentTicket() {
-    loadTicketContent($(".ticket-item.bgc-grey-100").data("uuid"));
+    loadTicketContent($(".ticket-item.active").data("uuid"));
 }
 
 function changeTicket(next=true) {
-    var selectedTicket = $(".ticket-item.bgc-grey-100");
+    var selectedTicket = $(".ticket-item.active");
     var uuid;
 
-    if (!selectedTicket.length) {
-        uuid = $(".ticket-item").first().data("uuid");
-        loadTicketContent(uuid);
-        return;
-    }
+    if (!selectedTicket.length) selectedTicket = $(".ticket-item").first();
+    else if (next) selectedTicket = selectedTicket.next();
+    else selectedTicket = selectedTicket.prev();
 
-    if (next) {
-        uuid = selectedTicket.next().data("uuid");
-        loadTicketContent(uuid);
-    }
-    else {
-        uuid = selectedTicket.prev().data("uuid");
-        loadTicketContent(uuid);
-    }
+    $(".ticket-item").removeClass("active");
+    selectedTicket.addClass("active");
+    uuid = selectedTicket.data("uuid");
+    loadTicketContent(uuid);
 
     if (!$('.email-content').hasClass('open')) {
         $('.email-content').addClass('open');
@@ -222,8 +218,8 @@ function loadTicketItems(page=1) {
         const ticketHasPrevPage = typeof response.previous === "string";
         $("#ticketItemsNextPage").prop("disabled", !ticketHasNextPage);
         $("#ticketItemsPrevPage").prop("disabled", !ticketHasPrevPage);
-        const pageNumber = filters["page"] || 1;
-        pagination = {
+        const pageNumber = filters["page"] || 1;  // If we haven't tracked the page, it's safe to assume it's 1,
+        pagination = {                            // because we always track it when it changes.
             "page": pageNumber,
             "next": ticketHasNextPage,
             "prev": ticketHasPrevPage