diff --git a/debian/changelog b/debian/changelog
index b259b45..330e5e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+steamos-compositor (1.20) alchemist; urgency=medium
+
+  * Fix cases where notifications/overlays would start getting presented before
+    the first frame had landed from Steam, resulting in a black flash.
+
+ -- Pierre-Loup A. Griffais <pgriffais@valvesoftware.com>  Mon, 30 Jun 2014 15:54:03 -0700
+
 steamos-compositor (1.19) alchemist; urgency=medium
 
   * Integrate LunarG patch to exclude MS visuals; they can't be used for TFP on
diff --git a/src/steamcompmgr.c b/src/steamcompmgr.c
index f9e49fc..c5eb795 100644
--- a/src/steamcompmgr.c
+++ b/src/steamcompmgr.c
@@ -606,6 +606,9 @@ paint_window (Display *dpy, win *w, Bool doBlend, Bool notificationMode)
 	if (!w)
 		return;
 	
+	if (w->isOverlay && !w->damaged)
+		return;
+	
 	win *mainOverlayWindow = find_win(dpy, currentOverlayWindow);
 
 	if (notificationMode && !mainOverlayWindow)