diff --git a/mozilla/netwerk/mime/src/nsMIMEInfoImpl.cpp b/mozilla/netwerk/mime/src/nsMIMEInfoImpl.cpp
index 4c20a420ec5..1f07d036271 100644
--- a/mozilla/netwerk/mime/src/nsMIMEInfoImpl.cpp
+++ b/mozilla/netwerk/mime/src/nsMIMEInfoImpl.cpp
@@ -298,7 +298,14 @@ NS_IMETHODIMP nsMIMEInfoImpl::SetPreferredApplicationHandler(nsIFile * aPreferre
 
 NS_IMETHODIMP nsMIMEInfoImpl::GetHasDefaultHandler(PRBool * _retval)
 {
+#ifdef XP_WIN
+  // On Windows, we ShellExecute any kind of file
+  // (defaultApplication is always null on windows, too)
+  // Most useful is probably presence/lack of default description
+  *_retval = !mDefaultAppDescription.IsEmpty();
+#else
   *_retval = mDefaultApplication != nsnull;
+#endif
   return NS_OK;
 }
 
diff --git a/mozilla/uriloader/exthandler/nsMIMEInfoImpl.cpp b/mozilla/uriloader/exthandler/nsMIMEInfoImpl.cpp
index 4c20a420ec5..1f07d036271 100644
--- a/mozilla/uriloader/exthandler/nsMIMEInfoImpl.cpp
+++ b/mozilla/uriloader/exthandler/nsMIMEInfoImpl.cpp
@@ -298,7 +298,14 @@ NS_IMETHODIMP nsMIMEInfoImpl::SetPreferredApplicationHandler(nsIFile * aPreferre
 
 NS_IMETHODIMP nsMIMEInfoImpl::GetHasDefaultHandler(PRBool * _retval)
 {
+#ifdef XP_WIN
+  // On Windows, we ShellExecute any kind of file
+  // (defaultApplication is always null on windows, too)
+  // Most useful is probably presence/lack of default description
+  *_retval = !mDefaultAppDescription.IsEmpty();
+#else
   *_retval = mDefaultApplication != nsnull;
+#endif
   return NS_OK;
 }