diff --git a/main.js b/main.js
index 0bb0586..97909d6 100644
--- a/main.js
+++ b/main.js
@@ -428,9 +428,12 @@ async function createWindow() {
         socket.on('disconnect', async () => {
           if (!global.gameStarted)
             await handleDisconnectInRoom(player, io)
+          else
+            await handleDisconnectInGame(player, io)
         })
 
         socket.on('leave_game', async () => {
+          socket.disconnect()
           await handleDisconnectInGame(player, io)
         })
 
diff --git a/renderer.js b/renderer.js
index aa9486b..27c0a09 100644
--- a/renderer.js
+++ b/renderer.js
@@ -370,7 +370,7 @@ function gameJoin(username) {
 			socket.emit('leave_game')
 			Swal.fire({
 				title: 'Game Over!',
-				html: `<p style="display: inline">You were defeated by</p><p style="display: inline" class="reqplayer color${player.color}">${player.username}</p>`,
+				html: `<p style="display: inline">You were defeated by </p><p style="display: inline" class="reqplayer color${player.color}">${player.username}</p>`,
 				icon: 'warning',
 				showDenyButton: true,
 				showCancelButton: false,