diff --git a/docs/changes.txt b/docs/changes.txt
index 0f856e8653..cbb2b368f0 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -644,6 +644,7 @@ wxOSX:
 - Send wxIconizeEvent when a window is iconized/restore (Rob Krakora).
 - Use correct colour for disabled wxStaticText (sbrowne).
 - Fix initial position of controls with layout insets (Tim Kosse).
+- Don't allow pasting rich text in non-wxTE_RICH text controls (Tim Kosse).
 - Fix printing all pages non-interactively (John Roberts).
 - Fix custom paper support (tijsv).
 - Return false from wxSound::Create()/IsOk() if the file doesn't exist.
diff --git a/src/osx/cocoa/textctrl.mm b/src/osx/cocoa/textctrl.mm
index c5bfb88958..a2caa6e71a 100644
--- a/src/osx/cocoa/textctrl.mm
+++ b/src/osx/cocoa/textctrl.mm
@@ -580,6 +580,11 @@ wxNSTextViewControl::wxNSTextViewControl( wxTextCtrl *wxPeer, WXWidget w )
     [tv setHorizontallyResizable:NO];
     [tv setAutoresizingMask:NSViewWidthSizable];
 
+    if ( !wxPeer->HasFlag(wxTE_RICH | wxTE_RICH2) )
+    {
+        [tv setRichText:NO];
+    }
+
     [m_scrollView setDocumentView: tv];
 
     [tv setDelegate: tv];