diff --git a/src/wp-admin/js/comment.js b/src/wp-admin/js/comment.js
index 4f15b51e76..7d5b15b750 100644
--- a/src/wp-admin/js/comment.js
+++ b/src/wp-admin/js/comment.js
@@ -9,7 +9,7 @@ jQuery(document).ready( function($) {
 	$timestampdiv.siblings('a.edit-timestamp').click( function( event ) {
 		if ( $timestampdiv.is( ':hidden' ) ) {
 			$timestampdiv.slideDown('fast');
-			$('#mm').focus();
+			$( 'input, select', $timestampdiv.find( '.timestamp-wrap' ) ).first().focus();
 			$(this).hide();
 		}
 		event.preventDefault();
diff --git a/src/wp-admin/js/post.js b/src/wp-admin/js/post.js
index 2b55a2bf2f..01363a3776 100644
--- a/src/wp-admin/js/post.js
+++ b/src/wp-admin/js/post.js
@@ -650,7 +650,7 @@ jQuery(document).ready( function($) {
 		$timestampdiv.siblings('a.edit-timestamp').click( function( event ) {
 			if ( $timestampdiv.is( ':hidden' ) ) {
 				$timestampdiv.slideDown('fast');
-				$('#mm').focus();
+				$( 'input, select', $timestampdiv.find( '.timestamp-wrap' ) ).first().focus();
 				$(this).hide();
 			}
 			event.preventDefault();