diff --git a/app/views/wiki/edit.rhtml b/app/views/wiki/edit.rhtml
index 270d5bec..0da5eb6f 100644
--- a/app/views/wiki/edit.rhtml
+++ b/app/views/wiki/edit.rhtml
@@ -14,7 +14,7 @@
 %>
 
 <p>
-    <textarea name="content" style="width: 450px; height: 500px"><%= h(@flash[:content] || @page.content) %></textarea>
+    <textarea name="content" id="content" style="width: 450px; height: 500px"><%= h(@flash[:content] || @page.content) %></textarea>
 </p>
 <p>
     <input type="submit" value="Submit" accesskey="s"/> as 
@@ -35,4 +35,5 @@ function cleanAuthorName() {
     document.getElementById('authorName').value = 'AnonymousCoward';
   }
 }
+document.forms["editForm"].elements["content"].focus();
 </script>
diff --git a/app/views/wiki/new.rhtml b/app/views/wiki/new.rhtml
index e7a73bca..fcc6d565 100644
--- a/app/views/wiki/new.rhtml
+++ b/app/views/wiki/new.rhtml
@@ -30,4 +30,5 @@ function cleanAuthorName() {
     document.getElementById('authorName').value = 'AnonymousCoward';
   }
 }
+document.forms["editForm"].elements["content"].focus();
 </script>