diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 6f3ba040db..a8176b0103 100644
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -2120,11 +2120,11 @@ wxSize wxWindowMSW::DoGetBorderSize() const
             break;
 
         case wxBORDER_SUNKEN:
+        case wxBORDER_THEME:
             border = 2;
             break;
 
         case wxBORDER_RAISED:
-        case wxBORDER_DOUBLE:
             border = 3;
             break;