diff --git a/public/script.js b/public/script.js
index 8d4867799..59ec83ade 100644
--- a/public/script.js
+++ b/public/script.js
@@ -2453,8 +2453,6 @@ function select_selected_character(chid) {
     setRightTabSelectedClass('rm_button_selected_ch');
     var display_name = characters[chid].name;
 
-    $("#rm_button_selected_ch").children("h2").text(display_name);
-
     //create text poles
     $("#rm_button_back").css("display", "none");
     //$("#character_import_button").css("display", "none");
@@ -3034,8 +3032,12 @@ $(document).ready(function () {
         select_rm_create();
     });
     $("#rm_button_selected_ch").click(function () {
-        selected_button = "character_edit";
-        select_selected_character(this_chid);
+        if (selected_group) {
+            select_group_chats(selected_group);
+        } else {
+            selected_button = "character_edit";
+            select_selected_character(this_chid);
+        }
     });
 
     $(document).on("click", ".character_select", function () {
diff --git a/public/scripts/group-chats.js b/public/scripts/group-chats.js
index 32af4e697..380263d14 100644
--- a/public/scripts/group-chats.js
+++ b/public/scripts/group-chats.js
@@ -486,7 +486,7 @@ function select_group_chats(chat_id) {
     });
     $("#rm_group_filter").val("").trigger("input");
 
-    selectRightMenuWithAnimation('rm_group_chats_block')
+    selectRightMenuWithAnimation('rm_group_chats_block');
 
     async function memberClickHandler(event) {
         event.stopPropagation();
@@ -578,8 +578,8 @@ function select_group_chats(chat_id) {
 
     // top bar
     if (group) {
-        $("#rm_button_selected_ch").children("h2").text("");
-        setRightTabSelectedClass();
+        $("#rm_button_selected_ch").children("h2").text(groupName);
+        setRightTabSelectedClass('rm_button_selected_ch');
     }
 }