diff --git a/src/driver/fade.cpp b/src/driver/fade.cpp
index caefff571..fa6c9a5d9 100644
--- a/src/driver/fade.cpp
+++ b/src/driver/fade.cpp
@@ -88,10 +88,11 @@ void COSDFader::Stop()
 {
 	if ( fadeIn || fadeOut ) {
 		g_RCInput->killTimer(fadeTimer);
+		usleep(40000);
 #ifdef BOXMODEL_APOLLO
-	frameBuffer->setBlendMode(CNXTFB_BLEND_MODE_PER_PIXEL); // Global alpha multiplied with pixel alpha
+		frameBuffer->setBlendMode(CNXTFB_BLEND_MODE_PER_PIXEL); // Global alpha multiplied with pixel alpha
 #else
-	frameBuffer->setBlendMode(1); // Global alpha multiplied with pixel alpha
+		frameBuffer->setBlendMode(1); // Global alpha multiplied with pixel alpha
 #endif
 		fadeIn = fadeOut = false;
 	}
diff --git a/src/driver/framebuffer.cpp b/src/driver/framebuffer.cpp
index 253d335d1..eb2e49089 100644
--- a/src/driver/framebuffer.cpp
+++ b/src/driver/framebuffer.cpp
@@ -543,7 +543,7 @@ void CFrameBuffer::setBlendLevel(int level)
 
 	if (ioctl(fd, FBIO_SETOPACITY, value))
 		printf("FBIO_SETOPACITY failed.\n");
-#ifndef ISAPOLLO
+#if 0
 	   if(level == 100) // TODO: sucks.
 		   usleep(20000);
 #endif