diff --git a/src/js/script.js b/src/js/script.js
index 2e3c579ae..403c1c009 100644
--- a/src/js/script.js
+++ b/src/js/script.js
@@ -1881,7 +1881,7 @@ function showResult(difficultyFailed = false, mp_outOfTime = false) {
     $(".pageTest #practiseMissedWordsButton").addClass("hidden");
     $(".pageTest #result .tribeResultChat").removeClass("hidden");
     if (MP.room.isLeader) {
-      $(".pageTest #backToLobbyButton").removeClass("hidden");
+      // $(".pageTest #backToLobbyButton").removeClass("hidden");
       // $(".pageTest #nextTestButton").removeClass("hidden");
       $(".pageTest #readyButton").addClass("hidden");
     }
@@ -5116,6 +5116,10 @@ function handleTab(event) {
     //   $("#customTextPopup .textarea").val() + "\t"
     // );
     return;
+  } else if (MP.state > 10) {
+    if (MP.state < 28) {
+      event.preventDefault();
+    }
   } else if (
     !event.ctrlKey &&
     ((!event.shiftKey && !textHasTab) ||
@@ -5163,14 +5167,10 @@ function handleTab(event) {
     !config.quickTab &&
     textHasTab &&
     event.shiftKey &&
-    !resultVisible &&
-    MP.state < 20
+    !resultVisible
   ) {
     event.preventDefault();
     $("#restartTestButton").focus();
-  } else if (MP.state >= 20) {
-    event.preventDefault();
-    return;
   }
 }
 
diff --git a/src/js/tribe.js b/src/js/tribe.js
index ed89bb532..fdff16318 100644
--- a/src/js/tribe.js
+++ b/src/js/tribe.js
@@ -937,6 +937,7 @@ MP.socket.on("mp_room_readyResultTimer_over", (data) => {
   hideResultCountdown();
   if (MP.room.isLeader) {
     $(".pageTest #nextTestButton").removeClass("hidden");
+    $(".pageTest #backToLobbyButton").removeClass("hidden");
   }
 });
 
@@ -956,6 +957,7 @@ MP.socket.on("mp_room_test_init", (data) => {
   restartTest(false, true, true);
   showCountdown();
   hideResultCountdown();
+  $(".pageTest #restartTestButton").addClass("hidden");
 });
 
 MP.socket.on("mp_room_state_update", (data) => {
@@ -1394,6 +1396,14 @@ $(
   MP.socket.emit("mp_user_ready");
 });
 
+$(
+  ".pageTribe .lobby .lobbyButtons .userReadyButton, .pageTest #result #readyButton"
+).on("keypress", "#nextTestButton", (event) => {
+  if (event.keyCode == 13) {
+    MP.socket.emit("mp_user_ready");
+  }
+});
+
 $(".pageTest #result #backToLobbyButton").click((e) => {
   MP.socket.emit("mp_room_back_to_lobby");
 });