diff --git a/mozilla/modules/plugin/samples/default/windows/plugin.cpp b/mozilla/modules/plugin/samples/default/windows/plugin.cpp
index 4613c8d9200..b0c069eedb5 100644
--- a/mozilla/modules/plugin/samples/default/windows/plugin.cpp
+++ b/mozilla/modules/plugin/samples/default/windows/plugin.cpp
@@ -715,9 +715,12 @@ void CPlugin::onPaint(HWND hWnd)
     DeletePen(hPen3DDKShadow);
     DeletePen(hPen3DShadow);
     DeletePen(hPen3DLight);
+    
+    DrawCommandMessage(hDC, m_szCommandMessage, &rc);
   }
-
-  DrawCommandMessage(hDC, m_szCommandMessage, &rc);
+  else
+    if(m_hIcon != NULL)
+      DrawIconEx(hDC, x, y, m_hIcon, rc.right - rc.left, rc.bottom - rc.top, 0, NULL, DI_NORMAL);
 
   EndPaint (hWnd, &ps);
 }