diff --git a/src/gui/audioplayer.cpp b/src/gui/audioplayer.cpp
index e8bd6ba24..19fe0fcc5 100644
--- a/src/gui/audioplayer.cpp
+++ b/src/gui/audioplayer.cpp
@@ -432,6 +432,11 @@ int CAudioPlayerGui::show()
 			if (m_screensaver)
 			{
 				screensaver(false);
+				if (msg < CRCInput::RC_MaxRC) {
+					// ignore first keypress - just quit the screensaver
+					g_RCInput->clearRCMsg();
+					continue;
+				}
 			}
 		}