diff --git a/src/servers/app/Canvas.cpp b/src/servers/app/Canvas.cpp
index e79b1527a2..3c53676e62 100644
--- a/src/servers/app/Canvas.cpp
+++ b/src/servers/app/Canvas.cpp
@@ -223,6 +223,15 @@ Canvas::ScreenToPenTransform() const GCC_2_NRV(transform)
 void
 Canvas::BlendLayer(Layer* layer)
 {
+	if (layer->Opacity() == 255) {
+		layer->Play(this);
+		layer->ReleaseReference();
+		return;
+	} else if (layer->Opacity() == 0) {
+		layer->ReleaseReference();
+		return;
+	}
+
 	UtilityBitmap* layerBitmap = layer->RenderToBitmap(this);
 	if (layerBitmap == NULL)
 		return;