diff --git a/src/js/script.js b/src/js/script.js
index 403c1c009..8a92b6707 100644
--- a/src/js/script.js
+++ b/src/js/script.js
@@ -4640,6 +4640,10 @@ $(document).on("click", "#top .logo", (e) => {
   changePage("test");
 });
 
+$(document).on("click", "#top .config .text-button", (e) => {
+  $(e.currentTarget).blur();
+});
+
 $(document).on("click", "#top .config .wordCount .text-button", (e) => {
   const wrd = $(e.currentTarget).attr("wordCount");
   if (wrd == "custom") {
diff --git a/src/js/tribe.js b/src/js/tribe.js
index 94050c030..1273a3809 100644
--- a/src/js/tribe.js
+++ b/src/js/tribe.js
@@ -90,6 +90,9 @@ function mp_refreshUserList() {
     if (user.isReady) {
       icons += '<i class="fas fa-check"></i>';
     }
+    if (user.isTyping) {
+      icons += '<i class="fas fa-keyboard"></i>';
+    }
     let pointsString;
     if (user.points == undefined) {
       pointsString = "";
@@ -100,7 +103,7 @@ function mp_refreshUserList() {
     <div class='user ${user.sid === MP.id ? "me" : ""}'>
     <div class='name'>${
       user.name
-    } ${icons}</div><div class='points'>${pointsString}</div>
+    }${icons}</div><div class='points'>${pointsString}</div>
     </div>
     `);
     $(".pageTest #result .tribeResultChat .userlist .list").append(`
@@ -1199,8 +1202,12 @@ MP.socket.on("mp_room_points", (data) => {
 });
 
 MP.socket.on("mp_room_back_to_lobby", (data) => {
+  Object.keys(MP.room.users).forEach((sid) => {
+    MP.room.users[sid].isTyping = false;
+  });
   $(".tribePlayers").addClass("hidden");
   changePage("tribe");
+  mp_refreshUserList();
 });
 
 MP.socket.on("mp_room_user_info_update", (data) => {
diff --git a/src/sass/style.scss b/src/sass/style.scss
index 48abd9981..d04240f20 100644
--- a/src/sass/style.scss
+++ b/src/sass/style.scss
@@ -2933,6 +2933,9 @@ key {
       justify-content: space-between;
       align-items: center;
       color: var(--text-color);
+      .fas {
+        margin-left: 0.25rem;
+      }
       .points {
         opacity: 0.5;
       }