diff --git a/docs/changes.txt b/docs/changes.txt
index b64e5f61b6..bfd797a653 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -114,6 +114,10 @@ wxGTK:
 - Fix wxNO_BORDER style for wxRadioBox (David Hart)
 - Fix wxTextCtrl::GetLineText() for empty lines (Marcin Wojdyr)
 
+wxUniv:
+
+- Fix wxTextCtrl::SetSelection(-1, -1) to behave as documented (Anders Larsen)
+
 
 2.8.3
 -----
diff --git a/src/univ/textctrl.cpp b/src/univ/textctrl.cpp
index ebb49dcc83..1fbc95a389 100644
--- a/src/univ/textctrl.cpp
+++ b/src/univ/textctrl.cpp
@@ -1434,8 +1434,12 @@ wxString wxTextCtrl::GetSelectionText() const
 void wxTextCtrl::SetSelection(wxTextPos from, wxTextPos to)
 {
     // selecting till -1 is the same as selecting to the end
-    if ( to == -1 && from != -1 )
+    if ( to == -1 )
     {
+        // and selecting (-1, -1) range is the same as selecting everything, by
+        // convention
+        if ( from == -1 )
+            from = 0;
         to = GetLastPosition();
     }