diff --git a/wp-admin/edit-form-comment.php b/wp-admin/edit-form-comment.php
index 67c74c866..7fe8fa7ea 100644
--- a/wp-admin/edit-form-comment.php
+++ b/wp-admin/edit-form-comment.php
@@ -85,13 +85,13 @@ echo "<a href='" . wp_nonce_url("comment.php?action=deletecomment&amp;c=$comment
 <div id="uridiv" class="stuffbox">
 <h3><?php _e('URL') ?></h3>
 <div class="inside">
-<input type="text" id="newcomment_author_url" name="newcomment_author_url" size="30" value="<?php echo attribute_escape( $comment->comment_author_url ); ?>" tabindex="2" />
+<input type="text" id="newcomment_author_url" name="newcomment_author_url" size="30" value="<?php echo attribute_escape( $comment->comment_author_url ); ?>" tabindex="3" />
 </div>
 </div>
 
 <div id="postdiv" class="postarea">
 <h3><?php _e('Comment') ?></h3>
-<?php the_editor($comment->comment_content, 'content', 'newcomment_author_url', false); ?>
+<?php the_editor($comment->comment_content, 'content', 'newcomment_author_url', false, 4); ?>
 <?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
 </div>
 
diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php
index 9d416142a..c762d6914 100644
--- a/wp-includes/general-template.php
+++ b/wp-includes/general-template.php
@@ -918,7 +918,7 @@ function wp_default_editor() {
 	return apply_filters( 'wp_default_editor', $r ); // filter
 }
 
-function the_editor($content, $id = 'content', $prev_id = 'title', $media_buttons = true) {
+function the_editor($content, $id = 'content', $prev_id = 'title', $media_buttons = true, $tab_index = 2) {
 	$rows = get_option('default_post_edit_rows');
 	if (($rows < 3) || ($rows > 100))
 		$rows = 12;
@@ -960,7 +960,7 @@ function the_editor($content, $id = 'content', $prev_id = 'title', $media_button
     </script>
     <?php endif; // 'html' != $wp_default_editor
 
-	$the_editor = apply_filters('the_editor', "<div id='editorcontainer'><textarea class='' $rows cols='40' name='$id' tabindex='2' id='$id'>%s</textarea></div>\n");
+	$the_editor = apply_filters('the_editor', "<div id='editorcontainer'><textarea class='' $rows cols='40' name='$id' tabindex='$tab_index' id='$id'>%s</textarea></div>\n");
 	$the_editor_content = apply_filters('the_editor_content', $content);
 
 	printf($the_editor, $the_editor_content);