diff --git a/src/d_main.c b/src/d_main.c
index 78a2b2d96..4fb55d728 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -319,7 +319,7 @@ static void D_Display(void)
 	switch (gamestate)
 	{
 		case GS_TITLESCREEN:
-			if (!gamemap) {
+			if (!titlemapinaction) {
 				F_TitleScreenDrawer();
 				break;
 			}
@@ -381,7 +381,7 @@ static void D_Display(void)
 
 	// clean up border stuff
 	// see if the border needs to be initially drawn
-	if (gamestate == GS_LEVEL || (gamestate == GS_TITLESCREEN && gamemap))
+	if (gamestate == GS_LEVEL || (gamestate == GS_TITLESCREEN && titlemapinaction))
 	{
 		// draw the view directly
 
@@ -440,11 +440,12 @@ static void D_Display(void)
 		}
 
 		if (gamestate == GS_LEVEL)
+		{
 			ST_Drawer();
+			HU_Drawer();
+		}
 		else
 			F_TitleScreenDrawer();
-
-		HU_Drawer();
 	}
 
 	// change gamma if needed
diff --git a/src/f_finale.c b/src/f_finale.c
index beeb0a2ea..9959ce0fc 100644
--- a/src/f_finale.c
+++ b/src/f_finale.c
@@ -32,11 +32,13 @@
 #include "y_inter.h"
 #include "m_cond.h"
 #include "p_local.h"
+#include "p_setup.h"
 
 // Stage of animation:
 // 0 = text, 1 = art screen
 static INT32 finalecount;
 INT32 titlescrollspeed = 80;
+boolean titlemapinaction = false;
 
 static INT32 timetonext; // Delay between screen changes
 static INT32 continuetime; // Short delay when continuing
@@ -1427,27 +1429,26 @@ void F_StartTitleScreen(void)
 
 	if (titlemap)
 	{
+		titlemapinaction = true;
 		gamemap = titlemap;
 
 		if (!mapheaderinfo[gamemap-1])
 			P_AllocMapHeader(gamemap-1);
 
 		G_DoLoadLevel(true);
-		G_SetGamestate(GS_TITLESCREEN);
 		players[displayplayer].playerstate = PST_DEAD; // Don't spawn the player in dummy (I'm still a filthy cheater)
+		camera.subsector = NULL; // toast is filthy too
 		//CON_ClearHUD();
 	}
 	else
 	{
-		gamemap = 0;
-
-		if (!mapheaderinfo[gamemap-1])
-			P_AllocMapHeader(gamemap-1);
-
-		G_SetGamestate(GS_TITLESCREEN);
+		titlemapinaction = false;
+		gamemap = 1; // g_game.c
 		CON_ClearHUD();
 	}
 
+	G_SetGamestate(GS_TITLESCREEN);
+
 	// IWAD dependent stuff.
 
 	S_ChangeMusicInternal("_title", looptitle);
@@ -1480,9 +1481,8 @@ void F_TitleScreenDrawer(void)
 		return; // We likely came here from retrying. Don't do a damn thing.
 
 	// Draw that sky!
-	if (!gamemap) {
+	if (!titlemapinaction)
 		F_SkyScroll(titlescrollspeed);
-	}
 
 	// Don't draw outside of the title screewn, or if the patch isn't there.
 	if (!ttwing || (gamestate != GS_TITLESCREEN && gamestate != GS_WAITINGPLAYERS))
@@ -1490,49 +1490,44 @@ void F_TitleScreenDrawer(void)
 
 	// rei|miru: use title pics?
 	if (hidetitlepics)
-	{
 		return;
+
+	V_DrawScaledPatch(30, 14, 0, ttwing);
+
+	if (finalecount < 57)
+	{
+		if (finalecount == 35)
+			V_DrawScaledPatch(115, 15, 0, ttspop1);
+		else if (finalecount == 36)
+			V_DrawScaledPatch(114, 15, 0,ttspop2);
+		else if (finalecount == 37)
+			V_DrawScaledPatch(113, 15, 0,ttspop3);
+		else if (finalecount == 38)
+			V_DrawScaledPatch(112, 15, 0,ttspop4);
+		else if (finalecount == 39)
+			V_DrawScaledPatch(111, 15, 0,ttspop5);
+		else if (finalecount == 40)
+			V_DrawScaledPatch(110, 15, 0, ttspop6);
+		else if (finalecount >= 41 && finalecount <= 44)
+			V_DrawScaledPatch(109, 15, 0, ttspop7);
+		else if (finalecount >= 45 && finalecount <= 48)
+			V_DrawScaledPatch(108, 12, 0, ttsprep1);
+		else if (finalecount >= 49 && finalecount <= 52)
+			V_DrawScaledPatch(107, 9, 0, ttsprep2);
+		else if (finalecount >= 53 && finalecount <= 56)
+			V_DrawScaledPatch(106, 6, 0, ttswip1);
+		V_DrawScaledPatch(93, 106, 0, ttsonic);
 	}
 	else
 	{
-		V_DrawScaledPatch(30, 14, 0, ttwing);
-
-		if (finalecount < 57)
-		{
-			if (finalecount == 35)
-				V_DrawScaledPatch(115, 15, 0, ttspop1);
-			else if (finalecount == 36)
-				V_DrawScaledPatch(114, 15, 0,ttspop2);
-			else if (finalecount == 37)
-				V_DrawScaledPatch(113, 15, 0,ttspop3);
-			else if (finalecount == 38)
-				V_DrawScaledPatch(112, 15, 0,ttspop4);
-			else if (finalecount == 39)
-				V_DrawScaledPatch(111, 15, 0,ttspop5);
-			else if (finalecount == 40)
-				V_DrawScaledPatch(110, 15, 0, ttspop6);
-			else if (finalecount >= 41 && finalecount <= 44)
-				V_DrawScaledPatch(109, 15, 0, ttspop7);
-			else if (finalecount >= 45 && finalecount <= 48)
-				V_DrawScaledPatch(108, 12, 0, ttsprep1);
-			else if (finalecount >= 49 && finalecount <= 52)
-				V_DrawScaledPatch(107, 9, 0, ttsprep2);
-			else if (finalecount >= 53 && finalecount <= 56)
-				V_DrawScaledPatch(106, 6, 0, ttswip1);
-			V_DrawScaledPatch(93, 106, 0, ttsonic);
-		}
+		V_DrawScaledPatch(93, 106, 0,ttsonic);
+		if (finalecount/5 & 1)
+			V_DrawScaledPatch(100, 3, 0,ttswave1);
 		else
-		{
-			V_DrawScaledPatch(93, 106, 0,ttsonic);
-			if (finalecount/5 & 1)
-				V_DrawScaledPatch(100, 3, 0,ttswave1);
-			else
-				V_DrawScaledPatch(100,3, 0,ttswave2);
-		}
-
-		V_DrawScaledPatch(48, 142, 0,ttbanner);
-
+			V_DrawScaledPatch(100,3, 0,ttswave2);
 	}
+
+	V_DrawScaledPatch(48, 142, 0,ttbanner);
 }
 
 // (no longer) De-Demo'd Title Screen
@@ -1546,7 +1541,7 @@ void F_TitleScreenTicker(boolean run)
 		return;
 
 	// Do a lil' camera spin if a title map is loaded.
-	if (gamemap) {
+	if (titlemapinaction) {
 		camera.x = camera.y = camera.height = camera.aiming = 0;
 		camera.z = 128*FRACUNIT;
 		camera.angle += titlescrollspeed;
diff --git a/src/f_finale.h b/src/f_finale.h
index 1e4d3a1e3..f710a74fb 100644
--- a/src/f_finale.h
+++ b/src/f_finale.h
@@ -60,9 +60,8 @@ void F_StartContinue(void);
 void F_ContinueTicker(void);
 void F_ContinueDrawer(void);
 
-extern INT16 titlemap;
-extern boolean hidetitlepics;
 extern INT32 titlescrollspeed;
+extern boolean titlemapinaction;
 
 //
 // WIPE
diff --git a/src/g_game.c b/src/g_game.c
index 3d89fd6db..c8fa261f2 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -120,7 +120,7 @@ INT16 spstage_start;
 INT16 sstage_start;
 INT16 sstage_end;
 
-INT16 titlemap;
+INT16 titlemap = 0;
 boolean hidetitlepics = false;
 
 boolean looptitle = false;
@@ -1988,7 +1988,7 @@ void G_Ticker(boolean run)
 			break;
 
 		case GS_TITLESCREEN:
-			if (gamemap) P_Ticker(run); // then intentionally fall through
+			if (titlemapinaction) P_Ticker(run); // then intentionally fall through
 		case GS_WAITINGPLAYERS:
 			F_TitleScreenTicker(run);
 			break;