diff --git a/src/gui/audioplayer.cpp b/src/gui/audioplayer.cpp
index c88fb4747..6bb5bdd26 100644
--- a/src/gui/audioplayer.cpp
+++ b/src/gui/audioplayer.cpp
@@ -478,12 +478,15 @@ int CAudioPlayerGui::show()
 			}
 		}
 
-		if (msg == CRCInput::RC_home || msg == CRCInput::RC_stop)
+		if (msg == CRCInput::RC_home)
+		{
+			if (m_state == CAudioPlayerGui::STOP)
+				loop=false;
+		}
+		else if (msg == CRCInput::RC_stop)
 		{
 			if (m_state != CAudioPlayerGui::STOP)
 				stop();
-			else
-				loop=false;
 		}
 		//NI - add RC_favorites for internetradio
 		else if ((msg == CRCInput::RC_favorites) && (m_inetmode))