diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index f41554eb46..af76477049 100644
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -300,6 +300,12 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
     SHInitExtraControls();
 #endif
 
+#ifndef __WXWINCE__
+    // Don't show a message box if a function such as SHGetFileInfo
+    // fails to find a device.
+    SetErrorMode(SEM_FAILCRITICALERRORS|SEM_NOOPENFILEERRORBOX);
+#endif
+    
     wxOleInitialize();
 
     RegisterWindowClasses();