diff --git a/source/backend/gameover.cpp b/source/backend/gameover.cpp
index f5c576784..f5e8ca579 100644
--- a/source/backend/gameover.cpp
+++ b/source/backend/gameover.cpp
@@ -409,13 +409,11 @@ void	CGameOverScene::thinkGameOver(int _frames)
 {
 	if(!CFader::isFading())
 	{
-		if(!m_finishedGrowingText)
+		m_gameOverTimer+=_frames;
+
+		if(m_finishedGrowingText&&!m_readyToExit)
 		{
-			m_gameOverTimer+=_frames;
-		}
-		else
-		{
-			if(!m_readyToExit&&PadGetDown(0)&(PAD_START|PAD_CROSS))
+			if(PadGetDown(0)&(PAD_START|PAD_CROSS)||m_gameOverTimer>GAMEOVER_DISPLAY_TIME)
 			{
 				m_readyToExit=true;
 				CFader::setFadingOut();
diff --git a/source/backend/gameover.h b/source/backend/gameover.h
index 21118d884..eb907c68f 100644
--- a/source/backend/gameover.h
+++ b/source/backend/gameover.h
@@ -79,6 +79,7 @@ private:
 		GAMEOVER_FONT_GROWSPEED=150,
 		GAMEOVER_FONT_GROWSPACING=900,
 		GAMEOVER_FONT_MAXSIN=1500,
+		GAMEOVER_DISPLAY_TIME=60*10,
 	};
 	void	initGameOver();
 	void	thinkGameOver(int _frames);