diff --git a/source/frontend/nicklogo.cpp b/source/frontend/nicklogo.cpp
index 0ba968a05..6d8d2cef3 100644
--- a/source/frontend/nicklogo.cpp
+++ b/source/frontend/nicklogo.cpp
@@ -90,12 +90,15 @@ void CFrontEndNickLogo::unselect()
   ---------------------------------------------------------------------- */
 void CFrontEndNickLogo::think(int _frames)
 {
-	m_frameCount+=_frames;
-
-	if(m_frameCount>DISPLAY_FRAMES&!m_readyToExit)
+	if(!CFader::isFading())
 	{
-		CFader::setFadingOut();
-		m_readyToExit=true;
+		m_frameCount+=_frames;
+
+		if(m_frameCount>DISPLAY_FRAMES&!m_readyToExit)
+		{
+			CFader::setFadingOut();
+			m_readyToExit=true;
+		}
 	}
 }