diff --git a/debian/changelog b/debian/changelog
index eb6e46012aa4fdcce12989c487810eb8706b6074..d0d9b0f4ff089fa64d989acad5a46d0fec29f8d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ compiz (2:0.9.12.2+hypra7.8) UNRELEASED; urgency=medium
   * Fix ezoom ABI dependency on focuspoll.
   * Track notification-daemon notifications.
   * Fix support for GSettings defaults overrides.
+  * Fix missing Firefox's frame in certain cases.
 
  -- Colomban Wendling <cwendling@hypra.fr>  Wed, 24 Oct 2018 10:08:20 +0200
 
diff --git a/src/event.cpp b/src/event.cpp
index 9799a192b68b6f39a97887adeea6a789b6cc7944..1e9dd0fd1799ae766c70496f65104c13f696f8f1 100644
--- a/src/event.cpp
+++ b/src/event.cpp
@@ -1496,16 +1496,16 @@ CompScreenImpl::_handleEvent (XEvent *event)
 	if (w)
 	{
 	    if (w->priv->pendingMaps)
+		w->priv->managed = true;
+
+	    if (w->priv->managed && !w->priv->serverFrame)
 	    {
 		/* The only case where this happens
 		 * is where the window unmaps itself
 		 * but doesn't get destroyed so when
 		 * it re-maps we need to reparent it */
 
-		if (!w->priv->serverFrame)
-		    w->priv->reparent ();
-
-		w->priv->managed = true;
+		w->priv->reparent ();
 	    }
 
 	    /* been shaded */