diff --git a/src/gui/audioplayer.cpp b/src/gui/audioplayer.cpp
index 23d8bdc3a..4d1e9ccc6 100644
--- a/src/gui/audioplayer.cpp
+++ b/src/gui/audioplayer.cpp
@@ -69,7 +69,7 @@
 #include <gui/screensaver.h>
 #include "gui/pictureviewer.h"
 extern CPictureViewer * g_PicViewer;
-
+#include <gui/infoclock.h>
 #include <system/settings.h>
 #include <system/helpers.h>
 #include <driver/screen_max.h>
@@ -334,7 +334,8 @@ int CAudioPlayerGui::show()
 
 	// clear whole screen
 	m_frameBuffer->paintBackground();
-
+	CInfoClock::getInstance()->block();
+	CScreenSaver::getInstance()->OnAfterStop.connect(sigc::mem_fun(CInfoClock::getInstance(), &CInfoClock::block));
 	CVFD::getInstance()->setMode(CVFD::MODE_AUDIO);
 	paintLCD();
 
@@ -848,7 +849,8 @@ int CAudioPlayerGui::show()
 
 	if (m_state != CAudioPlayerGui::STOP)
 		stop();
-
+	CInfoClock::getInstance()->enableInfoClock(CInfoClock::getInstance()->isRun());
+	CScreenSaver::getInstance()->OnAfterStop.clear();
 	return ret;
 }