diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index 91fca2d06..1ba82500c 100644
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -1944,6 +1944,7 @@ StScrollBar StButton#vhandle:active {
 
 .end-session-dialog-description:rtl {
     padding-right: 17px;
+    text-align: right;
 }
 
 .end-session-dialog-logout-icon {
@@ -1976,6 +1977,10 @@ StScrollBar StButton#vhandle:active {
     font-weight: bold;
 }
 
+.end-session-dialog-list-header:rtl {
+    text-align: right;
+}
+
 .end-session-dialog-app-list-item,
 .end-session-dialog-session-list-item {
     spacing: 1em;
diff --git a/js/ui/endSessionDialog.js b/js/ui/endSessionDialog.js
index 60ca3f7c0..1d43d211f 100644
--- a/js/ui/endSessionDialog.js
+++ b/js/ui/endSessionDialog.js
@@ -249,7 +249,9 @@ const EndSessionDialog = new Lang.Class({
         this._subjectLabel = new St.Label({ style_class: 'end-session-dialog-subject' });
 
         messageLayout.add(this._subjectLabel,
-                          { y_fill:  false,
+                          { x_fill: false,
+                            y_fill:  false,
+                            x_align: St.Align.START,
                             y_align: St.Align.START });
 
         this._descriptionLabel = new St.Label({ style_class: 'end-session-dialog-description' });