diff --git a/wp-admin/page.php b/wp-admin/page.php
index 112157d8ad..1acc8c367a 100644
--- a/wp-admin/page.php
+++ b/wp-admin/page.php
@@ -44,6 +44,12 @@ case 'edit':
 	$editing = true;
 	$page_ID = $post_ID = $p = (int) $_GET['post'];
 	$post = get_post_to_edit($page_ID);
+
+	if ( 'post' == $post->post_type ) {
+		wp_redirect("post.php?action=edit&post=$post_ID");
+		exit();
+	}
+
 	if($post->post_status == 'draft') {
 		wp_enqueue_script('prototype');
 		wp_enqueue_script('autosave');
diff --git a/wp-admin/post.php b/wp-admin/post.php
index dd756fbc02..8f0cc53621 100644
--- a/wp-admin/post.php
+++ b/wp-admin/post.php
@@ -47,6 +47,12 @@ case 'edit':
 	$editing = true;
 	$post_ID = $p = (int) $_GET['post'];
 	$post = get_post($post_ID);
+	
+	if ( 'page' == $post->post_type ) {
+		wp_redirect("page.php?action=edit&post=$post_ID");
+		exit();
+	}
+
 	if($post->post_status == 'draft') {
 		wp_enqueue_script('prototype');
 		wp_enqueue_script('autosave');