diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index 33b063047..08ea888d5 100644
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -1832,6 +1832,10 @@ StTooltip StLabel {
     padding-bottom: 6px;
 }
 
+.mount-question-dialog-subject {
+    max-width: 500px;
+}
+
 .show-processes-dialog-subject:rtl,
 .mount-question-dialog-subject:rtl {
     padding-left: 0px;
diff --git a/js/ui/shellMountOperation.js b/js/ui/shellMountOperation.js
index 0fd149e3c..8a91d9897 100644
--- a/js/ui/shellMountOperation.js
+++ b/js/ui/shellMountOperation.js
@@ -211,6 +211,8 @@ const ShellMountQuestionDialog = new Lang.Class({
                               { y_align: St.Align.START });
 
         this.subjectLabel = new St.Label({ style_class: 'mount-question-dialog-subject' });
+        this.subjectLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
+        this.subjectLabel.clutter_text.line_wrap = true;
 
         messageLayout.add(this.subjectLabel,
                           { y_fill:  false,