diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 34f6fcef48..5bf424a83e 100644
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -1162,7 +1162,8 @@ WXDWORD wxWindowMSW::MSWGetStyle(long flags, WXDWORD *exstyle) const
     // Windows XP. Instead we get the appropriate style for the theme.
 
     if (border == wxBORDER_DEFAULT && wxTheApp->GetAuto3D() && 
-        GetParent() && GetParent()->IsKindOf(CLASSINFO(wxPanel)) &&
+        GetParent() && (GetParent()->IsKindOf(CLASSINFO(wxPanel)) ||
+                        GetParent()->IsKindOf(CLASSINFO(wxDialog))) &&
         ((GetParent()->GetWindowStyleFlag() & wxUSER_COLOURS) != wxUSER_COLOURS))
     {
         border = (wxBorder)((flags & wxBORDER_MASK) | wxBORDER_SUNKEN);