diff --git a/src/richtext/richtextctrl.cpp b/src/richtext/richtextctrl.cpp
index 03e6139597..5a68ce5254 100644
--- a/src/richtext/richtextctrl.cpp
+++ b/src/richtext/richtextctrl.cpp
@@ -129,9 +129,11 @@ wxRichTextCtrl::wxRichTextCtrl(wxWindow* parent,
 bool wxRichTextCtrl::Create( wxWindow* parent, wxWindowID id, const wxString& value, const wxPoint& pos, const wxSize& size, long style,
                              const wxValidator& validator, const wxString& name)
 {
-#ifdef __WXMSW__
     if ((style & wxBORDER_MASK) == wxBORDER_DEFAULT)
-        style |= wxBORDER_THEME;
+#ifdef __WXMSW__
+        style |= GetThemedBorderStyle();
+#else
+        style |= wxBORDER_SUNKEN;
 #endif
 
     if (!wxTextCtrlBase::Create(parent, id, pos, size,
diff --git a/src/richtext/richtextstyles.cpp b/src/richtext/richtextstyles.cpp
index b139ee78ed..76df590727 100644
--- a/src/richtext/richtextstyles.cpp
+++ b/src/richtext/richtextstyles.cpp
@@ -835,7 +835,7 @@ bool wxRichTextStyleListCtrl::Create(wxWindow* parent, wxWindowID id, const wxPo
 #ifdef __WXMSW__
         listBoxStyle = GetThemedBorderStyle();
 #else
-        listBoxStyle = wxBORDER_SIMPLE;
+        listBoxStyle = wxBORDER_SUNKEN;
 #endif
     }
     else