diff --git a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
index d19725166c8..cbcd3eca993 100644
--- a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
+++ b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
@@ -2412,6 +2412,10 @@ NS_IMETHODIMP nsPluginHostImpl::Destroy(void)
 
   mIsDestroyed = PR_TRUE;
 
+  // we should call nsIPluginInstance::Stop and nsIPluginInstance::SetWindow 
+  // for those plugins who want it
+  mActivePluginList.stopRunning();  
+
   // at this point nsIPlugin::Shutdown calls will be performed if needed
   mActivePluginList.shut();
 
diff --git a/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp b/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp
index d19725166c8..cbcd3eca993 100644
--- a/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp
+++ b/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp
@@ -2412,6 +2412,10 @@ NS_IMETHODIMP nsPluginHostImpl::Destroy(void)
 
   mIsDestroyed = PR_TRUE;
 
+  // we should call nsIPluginInstance::Stop and nsIPluginInstance::SetWindow 
+  // for those plugins who want it
+  mActivePluginList.stopRunning();  
+
   // at this point nsIPlugin::Shutdown calls will be performed if needed
   mActivePluginList.shut();