diff --git a/src/gui/audiomute.cpp b/src/gui/audiomute.cpp
index 6bec9d9bf..da408782c 100644
--- a/src/gui/audiomute.cpp
+++ b/src/gui/audiomute.cpp
@@ -123,12 +123,12 @@ void CAudioMute::enableMuteIcon(bool enable)
 	frameBuffer->fbNoCheck(true);
 	if (enable) {
 		frameBuffer->doPaintMuteIcon(true);
-		do_paint_mute_icon = true;
-		if (neutrino->isMuted())
+		if (!do_paint_mute_icon && neutrino->isMuted())
 			this->paint();
+		do_paint_mute_icon = true;
 	}
 	else {
-		if (!neutrino->isMuted())
+		if (do_paint_mute_icon && !neutrino->isMuted())
 			this->kill();
 		frameBuffer->doPaintMuteIcon(false);
 		do_paint_mute_icon = false;