diff --git a/src/m_menu.c b/src/m_menu.c
index 1a3c43b75..5d1bbd07d 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -3212,10 +3212,7 @@ boolean M_Responder(event_t *ev)
 
 			case KEY_ESCAPE: // Pop up menu
 				if (chat_on)
-				{
 					HU_clearChatChars();
-					chat_on = false;
-				}
 				else
 					M_StartControlPanel();
 				return true;
diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c
index d6b36d0ed..e1b3781d9 100644
--- a/src/sdl/i_video.c
+++ b/src/sdl/i_video.c
@@ -380,12 +380,7 @@ static void SDLdoUngrabMouse(void)
 void SDLforceUngrabMouse(void)
 {
 	if (SDL_WasInit(SDL_INIT_VIDEO)==SDL_INIT_VIDEO && window != NULL)
-	{
-		SDL_ShowCursor(SDL_ENABLE);
-		SDL_SetWindowGrab(window, SDL_FALSE);
-		wrapmouseok = SDL_FALSE;
-		SDL_SetRelativeMouseMode(SDL_FALSE);
-	}
+		SDLdoUngrabMouse();
 }
 
 void I_UpdateMouseGrab(void)