diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp
index f1c1db17f21c..27f46e9e58be 100644
--- a/layout/base/nsPresShell.cpp
+++ b/layout/base/nsPresShell.cpp
@@ -7021,9 +7021,7 @@ PresShell::WillPaintWindow(bool aWillSendDidPaint)
     return;
   }
 
-  if (!aWillSendDidPaint) {
-    rootPresContext->ApplyPluginGeometryUpdates();
-  }
+  rootPresContext->ApplyPluginGeometryUpdates();
 }
 
 void
@@ -7031,13 +7029,11 @@ PresShell::DidPaintWindow()
 {
   nsRootPresContext* rootPresContext = mPresContext->GetRootPresContext();
   if (rootPresContext != mPresContext) {
-    // This could be a popup's presshell. We don't allow plugins in popups
-    // so there's nothing to do here.
+    // This could be a popup's presshell. No point in notifying XPConnect
+    // about compositing of popups.
     return;
   }
 
-  rootPresContext->ApplyPluginGeometryUpdates();
-
   if (nsContentUtils::XPConnect()) {
     nsContentUtils::XPConnect()->NotifyDidPaint();
   }