diff --git a/mozilla/embedding/browser/activex/src/control/ControlSite.cpp b/mozilla/embedding/browser/activex/src/control/ControlSite.cpp
index fc73f5eb476..4875afa37a4 100644
--- a/mozilla/embedding/browser/activex/src/control/ControlSite.cpp
+++ b/mozilla/embedding/browser/activex/src/control/ControlSite.cpp
@@ -731,7 +731,13 @@ HRESULT STDMETHODCALLTYPE CControlSite::GetDC(/* [in] */ LPCRECT pRect, /* [in]
 		return E_INVALIDARG;
 	}
 
-	// Can't do nested painting
+    if (grfFlags & OLEDC_NODRAW)
+    {
+        *phDC = m_hDCBuffer;
+        return S_OK;
+    }
+   
+   	// Can't do nested painting
 	if (m_hDCBuffer != NULL)
 	{
 		return E_UNEXPECTED;