diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index fa88d2dc95..5cc8e00a82 100644
--- a/src/msw/textctrl.cpp
+++ b/src/msw/textctrl.cpp
@@ -139,6 +139,9 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
     else
         msStyle |= ES_AUTOHSCROLL;
 
+    if (m_windowStyle & wxHSCROLL)
+        msStyle |= (WS_HSCROLL | ES_AUTOHSCROLL);
+
     if (m_windowStyle & wxTE_READONLY)
         msStyle |= ES_READONLY;