diff --git a/src/client/HelpModal.ts b/src/client/HelpModal.ts
index c07949d1b..64ffdcd4e 100644
--- a/src/client/HelpModal.ts
+++ b/src/client/HelpModal.ts
@@ -186,7 +186,7 @@ export class HelpModal extends LitElement {
 
     @media screen and (max-width: 768px) {
       #helpModal .modal-content {
-        max-height: 100vh;
+        max-height: 90vh;
         max-width: 100vw;
         width: 100%;
       }
diff --git a/src/client/HostLobbyModal.ts b/src/client/HostLobbyModal.ts
index 7747d861b..88fe262a9 100644
--- a/src/client/HostLobbyModal.ts
+++ b/src/client/HostLobbyModal.ts
@@ -303,7 +303,7 @@ export class HostLobbyModal extends LitElement {
 
     @media screen and (max-width: 768px) {
       .modal-content {
-        max-height: calc(100vh - 42px);
+        max-height: calc(90vh - 42px);
         max-width: 100vw;
         width: 100%;
       }
diff --git a/src/client/JoinPrivateLobbyModal.ts b/src/client/JoinPrivateLobbyModal.ts
index 53028f392..44c60e498 100644
--- a/src/client/JoinPrivateLobbyModal.ts
+++ b/src/client/JoinPrivateLobbyModal.ts
@@ -219,7 +219,7 @@ export class JoinPrivateLobbyModal extends LitElement {
 
     @media screen and (max-width: 768px) {
       .modal-content {
-        max-height: calc(100vh - 42px);
+        max-height: calc(90vh - 42px);
         max-width: 100vw;
         width: 100%;
       }
diff --git a/src/client/Main.ts b/src/client/Main.ts
index ca9405d8c..d891f224a 100644
--- a/src/client/Main.ts
+++ b/src/client/Main.ts
@@ -95,6 +95,7 @@ class Client {
       .addEventListener("click", () => {
         if (this.usernameInput.isValid()) {
           hostModal.open();
+          this.publicLobby.leaveLobby();
         }
       });
 
@@ -172,6 +173,7 @@ class Client {
     consolex.log("leaving lobby, cancelling game");
     this.gameStop();
     this.gameStop = null;
+    this.publicLobby.leaveLobby();
   }
 
   private async handleSinglePlayer(event: CustomEvent) {
diff --git a/src/client/PublicLobby.ts b/src/client/PublicLobby.ts
index bba66273e..5f63f5566 100644
--- a/src/client/PublicLobby.ts
+++ b/src/client/PublicLobby.ts
@@ -8,7 +8,7 @@ import { getMapsImage } from "./utilities/Maps";
 @customElement("public-lobby")
 export class PublicLobby extends LitElement {
   @state() private lobbies: Lobby[] = [];
-  @state() private isLobbyHighlighted: boolean = false;
+  @state() public isLobbyHighlighted: boolean = false;
   private lobbiesInterval: number | null = null;
   private currLobby: Lobby = null;
 
@@ -57,6 +57,7 @@ export class PublicLobby extends LitElement {
 
   public stop() {
     if (this.lobbiesInterval !== null) {
+      this.isLobbyHighlighted = false;
       clearInterval(this.lobbiesInterval);
       this.lobbiesInterval = null;
     }
@@ -115,9 +116,14 @@ export class PublicLobby extends LitElement {
     `;
   }
 
+  leaveLobby() {
+    this.isLobbyHighlighted = false;
+    this.currLobby = null;
+  }
+
   private lobbyClicked(lobby: Lobby) {
-    this.isLobbyHighlighted = !this.isLobbyHighlighted;
     if (this.currLobby == null) {
+      this.isLobbyHighlighted = true;
       this.currLobby = lobby;
       this.dispatchEvent(
         new CustomEvent("join-lobby", {
@@ -139,7 +145,7 @@ export class PublicLobby extends LitElement {
           composed: true,
         }),
       );
-      this.currLobby = null;
+      this.leaveLobby();
     }
   }
 }
diff --git a/src/client/SinglePlayerModal.ts b/src/client/SinglePlayerModal.ts
index 7d917ca69..5b06fe4e2 100644
--- a/src/client/SinglePlayerModal.ts
+++ b/src/client/SinglePlayerModal.ts
@@ -226,7 +226,7 @@ export class SinglePlayerModal extends LitElement {
 
     @media screen and (max-width: 768px) {
       .modal-content {
-        max-height: calc(100vh - 42px);
+        max-height: calc(90vh - 42px);
         max-width: 100vw;
         width: 100%;
       }