diff --git a/reviewboard/static/rb/js/views/reviewRequestEditorView.js b/reviewboard/static/rb/js/views/reviewRequestEditorView.js
index 12221dc3796a62a9159fd6a8145601a27f3d450e..271794188b33726b3778cecc85713d67ccafbd16 100644
--- a/reviewboard/static/rb/js/views/reviewRequestEditorView.js
+++ b/reviewboard/static/rb/js/views/reviewRequestEditorView.js
@@ -807,12 +807,13 @@ RB.ReviewRequestEditorView = Backbone.View.extend({
             editableProp = (fieldOptions.statusField
                             ? 'statusEditable'
                             : 'editable'),
+            multiline = (el.tagName === 'PRE'),
             options = {
                 cls: id + '-editor',
                 editIconClass: 'rb-icon rb-icon-edit',
                 enabled: this.model.get(editableProp),
-                multiline: el.tagName === 'PRE',
-                showButtons: false,
+                multiline: multiline,
+                showButtons: multiline,
                 useEditIconOnly: fieldOptions.useEditIconOnly,
                 showRequiredFlag: $el.hasClass('required')
             };