diff --git a/modules/plugin/base/src/nsPluginHostImpl.cpp b/modules/plugin/base/src/nsPluginHostImpl.cpp
index 315776dbdeb3..c1332d276c52 100644
--- a/modules/plugin/base/src/nsPluginHostImpl.cpp
+++ b/modules/plugin/base/src/nsPluginHostImpl.cpp
@@ -2608,6 +2608,10 @@ NS_IMETHODIMP nsPluginHostImpl::InstantiateFullPagePlugin(const char *aMimeType,
 
       rv = NewFullPagePluginStream(aStreamListener, instance);
 
+      // If we've got a native window, the let the plugin know about it.
+      if (window->window)
+        instance->SetWindow(window);
+
       NS_RELEASE(instance);
     }
   }
diff --git a/modules/plugin/nglsrc/nsPluginHostImpl.cpp b/modules/plugin/nglsrc/nsPluginHostImpl.cpp
index 315776dbdeb3..c1332d276c52 100644
--- a/modules/plugin/nglsrc/nsPluginHostImpl.cpp
+++ b/modules/plugin/nglsrc/nsPluginHostImpl.cpp
@@ -2608,6 +2608,10 @@ NS_IMETHODIMP nsPluginHostImpl::InstantiateFullPagePlugin(const char *aMimeType,
 
       rv = NewFullPagePluginStream(aStreamListener, instance);
 
+      // If we've got a native window, the let the plugin know about it.
+      if (window->window)
+        instance->SetWindow(window);
+
       NS_RELEASE(instance);
     }
   }