diff --git a/public/script.js b/public/script.js
index 47954eb3c..97fbf15d6 100644
--- a/public/script.js
+++ b/public/script.js
@@ -2696,6 +2696,8 @@ async function renameCharacter() {
 async function saveChat(chat_name, withMetadata) {
     const metadata = { ...chat_metadata, ...(withMetadata || {}) };
     let file_name = chat_name ?? characters[this_chid].chat;
+    characters[this_chid]['date_last_chat'] = Date.now();
+    sortCharactersList();
     chat.forEach(function (item, i) {
         if (item["is_group"]) {
             alert('Trying to save group chat with regular saveChat function. Aborting to prevent corruption.');
diff --git a/public/scripts/group-chats.js b/public/scripts/group-chats.js
index 96cd2ae9e..b39a92a3e 100644
--- a/public/scripts/group-chats.js
+++ b/public/scripts/group-chats.js
@@ -191,6 +191,7 @@ function resetSelectedGroup() {
 async function saveGroupChat(groupId, shouldSaveGroup) {
     const group = groups.find(x => x.id == groupId);
     const chat_id = group.chat_id;
+    group['date_last_chat'] = Date.now();
     const response = await fetch("/savegroupchat", {
         method: "POST",
         headers: getRequestHeaders(),
diff --git a/public/style.css b/public/style.css
index 5d6db4e6b..d852aeb43 100644
--- a/public/style.css
+++ b/public/style.css
@@ -587,6 +587,7 @@ code {
     transition: 250ms;
     overflow: hidden;
     padding: 0 !important;
+    order: 100;
 }
 
 .hotswapAvatar:hover {