diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index 0f0df57bd..099216936 100644
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -1948,22 +1948,22 @@ StScrollBar StButton#vhandle:active {
 }
 
 .end-session-dialog-subject {
-    padding-left: 17px;
     padding-bottom: 20px;
 }
 
-.end-session-dialog-subject:rtl {
-    padding-left: 0px;
+.end-session-dialog-layout {
+    padding-left: 17px;
+}
+
+.end-session-dialog-layout:rtl {
     padding-right: 17px;
 }
 
 .end-session-dialog-description {
-    padding-left: 17px;
     width: 28em;
 }
 
 .end-session-dialog-description:rtl {
-    padding-right: 17px;
     text-align: right;
 }
 
diff --git a/js/ui/endSessionDialog.js b/js/ui/endSessionDialog.js
index a8a056e17..c9ddce8db 100644
--- a/js/ui/endSessionDialog.js
+++ b/js/ui/endSessionDialog.js
@@ -240,7 +240,8 @@ const EndSessionDialog = new Lang.Class({
                                 x_align: St.Align.END,
                                 y_align: St.Align.START });
 
-        let messageLayout = new St.BoxLayout({ vertical: true });
+        let messageLayout = new St.BoxLayout({ vertical: true,
+                                               style_class: 'end-session-dialog-layout' });
         mainContentLayout.add(messageLayout,
                               { y_align: St.Align.START });