diff --git a/src/fitnesse/resources/css/fitnesse_pages.css b/src/fitnesse/resources/css/fitnesse_pages.css
index 1c171d7be8..7a5b3417a5 100644
--- a/src/fitnesse/resources/css/fitnesse_pages.css
+++ b/src/fitnesse/resources/css/fitnesse_pages.css
@@ -9,6 +9,9 @@ label input {
 textarea {
 	font-family: monospace;
 }
+textarea.no_wrap {
+	overflow: scroll;
+}
 .validationerror {
     color: maroon;
     margin: 0 0 0 7.78em;
@@ -21,6 +24,10 @@ textarea {
 	float: left;
 	clear: both;
 }
+.editPage .edit_options label {
+	width: auto;
+}
+
 .editPage #pagename,
 .editPage #helptext {
 	width: 55em;
diff --git a/src/fitnesse/resources/javascript/textareaWrapSupport.js b/src/fitnesse/resources/javascript/textareaWrapSupport.js
index 3476062814..bcaf7ae4a1 100644
--- a/src/fitnesse/resources/javascript/textareaWrapSupport.js
+++ b/src/fitnesse/resources/javascript/textareaWrapSupport.js
@@ -32,5 +32,4 @@ function toggleWrap(checkbox) {
   }
 }
 
-document.write('<input type="checkbox" accesskey="w" onClick="toggleWrap(this)" title="Turns on/off wrapping">');
-document.write('<span>wrap</span>');
+document.write('<label for="wrapsupport"><input type="checkbox" id="wrapsupport" accesskey="w" onClick="toggleWrap(this)" title="Turns on/off wrapping"/>Wrap</label>');
diff --git a/src/fitnesse/resources/templates/editPage.vm b/src/fitnesse/resources/templates/editPage.vm
index 1efe919180..51016de1a3 100644
--- a/src/fitnesse/resources/templates/editPage.vm
+++ b/src/fitnesse/resources/templates/editPage.vm
@@ -32,7 +32,7 @@
   <script src="/files/fitnesse/javascript/textareaWrapSupport.js" type="text/javascript"></script>
  </fieldset>
 
- <textarea class="pageContent" id="pageContentId" name="pageContent">$pageContent</textarea>
+ <textarea class="pageContent no_wrap" id="pageContentId" name="pageContent" wrap="off">$pageContent</textarea>
 
  <fieldset class="edit_buttons">
 
diff --git a/src/fitnesse/responders/editing/NewPageResponderTest.java b/src/fitnesse/responders/editing/NewPageResponderTest.java
index 5d20ef8256..a86892f12d 100644
--- a/src/fitnesse/responders/editing/NewPageResponderTest.java
+++ b/src/fitnesse/responders/editing/NewPageResponderTest.java
@@ -39,7 +39,7 @@ public void testResponse() throws Exception {
     assertSubString("name=\"responder\"", body);
     assertSubString("name=\"" + EditResponder.HELP_TEXT + "\"", body);
     assertSubString("type=\"submit\"", body);
-    assertSubString(String.format("textarea class=\"%s\"", EditResponder.CONTENT_INPUT_NAME), body);
+    assertSubString(String.format("textarea class=\"%s no_wrap\"", EditResponder.CONTENT_INPUT_NAME), body);
   }
 
 }