diff --git a/docs/changes.txt b/docs/changes.txt
index a3d4a9a5d0..094162c394 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -225,6 +225,7 @@ wxOSX:
 - Allow turning on/off opacity selector in wxColourDialog.
 - Implement wxTextCtrl::PositionToXY() and XYToPosition().
 - Implement wxTextCtrl::ShowPosition().
+- Add support for wxTE_NO_VSCROLL style to wxTextCtrl.
 
 Unix:
 
diff --git a/interface/wx/textctrl.h b/interface/wx/textctrl.h
index dd91ef5914..1bcb628444 100644
--- a/interface/wx/textctrl.h
+++ b/interface/wx/textctrl.h
@@ -976,8 +976,8 @@ public:
     @style{wxTE_NO_VSCROLL}
            For multiline controls only: vertical scrollbar will never be
            created. This limits the amount of text which can be entered into
-           the control to what can be displayed in it under MSW but not under
-           GTK2. Currently not implemented for the other platforms.
+           the control to what can be displayed in it under wxMSW but not under
+           wxGTK or wxOSX. Currently not implemented for the other platforms.
     @style{wxTE_LEFT}
            The text in the control will be left-justified (default).
     @style{wxTE_CENTRE}
diff --git a/src/osx/cocoa/textctrl.mm b/src/osx/cocoa/textctrl.mm
index 0b37e0d84f..516d0ac637 100644
--- a/src/osx/cocoa/textctrl.mm
+++ b/src/osx/cocoa/textctrl.mm
@@ -716,6 +716,7 @@ wxNSTextViewControl::wxNSTextViewControl( wxTextCtrl *wxPeer, WXWidget w, long s
 
     [m_scrollView setHasVerticalScroller:YES];
     [m_scrollView setHasHorizontalScroller:hasHScroll];
+    [m_scrollView setHasVerticalScroller:(style & wxTE_NO_VSCROLL)? NO: YES];
     NSSize contentSize = [m_scrollView contentSize];
     NSRect viewFrame = NSMakeRect(
             0, 0,