diff --git a/less/forms.less b/less/forms.less
index 5d51cefd..4a18e72a 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -343,19 +343,24 @@ select:focus:required:invalid {
   background-color: @white;
   border-color: #eee;
   .box-shadow(inset 0 1px 2px rgba(0,0,0,.025));
-  cursor: not-allowed;
+  cursor: text;
   padding: 4px 3px 4px 5px;
-  overflow-y: auto;
-  overflow-x: hidden;
 }
 .uneditable-input[disabled],
 .uneditable-textarea[disabled] {
   background-color: #f5f5f5;
   border-color: #ddd;
+  cursor: not-allowed;
+}
+.uneditable-input {
+  white-space: pre;
+  overflow: hidden;
 }
 .uneditable-textarea {
   height: 3 * @baseLineHeight;
   white-space: pre-wrap;
+  overflow-y: auto;
+  overflow-x: hidden;
   &[rows="1"]   { height:  (1 +  1) * @baseLineHeight; }
   &[rows="2"]   { height:  (1 +  2) * @baseLineHeight; }
   &[rows="3"]   { height:  (1 +  3) * @baseLineHeight; }
@@ -537,11 +542,6 @@ textarea.editor-ckeditor {
 // ---------------
 
 .uneditable-form {
-  .uneditable-input,
-  .uneditable-textarea {
-    cursor: text;
-  }
-
   .form-actions {
     background-color: transparent;
   }