diff --git a/components/richmemo/gtk2/gtk2richmemo.pas b/components/richmemo/gtk2/gtk2richmemo.pas
index bd2bfdb34..32c21fda4 100644
--- a/components/richmemo/gtk2/gtk2richmemo.pas
+++ b/components/richmemo/gtk2/gtk2richmemo.pas
@@ -634,7 +634,11 @@ begin
   GetWidgetInfo(Widget, True)^.CoreWidget := TempWidget;
 
   gtk_text_view_set_editable(PGtkTextView(TempWidget), not TCustomMemo(AWinControl).ReadOnly);
-  gtk_text_view_set_wrap_mode(PGtkTextView(TempWidget), GTK_WRAP_WORD);
+  gtk_text_view_set_justification(PGtkTextView(TempWidget), aGtkJustification[TCustomMemo(AWinControl).Alignment]);
+  if TCustomMemo(AWinControl).WordWrap then
+    gtk_text_view_set_wrap_mode(PGtkTextView(TempWidget), GTK_WRAP_WORD)
+  else
+    gtk_text_view_set_wrap_mode(PGtkTextView(TempWidget), GTK_WRAP_NONE);
 
   gtk_text_view_set_accepts_tab(PGtkTextView(TempWidget), TCustomMemo(AWinControl).WantTabs);