diff --git a/wp-admin/edit.php b/wp-admin/edit.php
index d30931614..3de50e544 100644
--- a/wp-admin/edit.php
+++ b/wp-admin/edit.php
@@ -11,7 +11,7 @@ require_once('./admin.php');
 
 if ( !isset($_GET['post_type']) )
 	$post_type = 'post';
-elseif ( in_array( $_GET['post_type'], get_post_types( array('public' => true ) ) ) )
+elseif ( in_array( $_GET['post_type'], get_post_types( array('show_ui' => true ) ) ) || in_array( $_GET['post_type'], array( 'post', 'page' ) ) )
 	$post_type = $_GET['post_type'];
 else
 	wp_die( __('Invalid post type') );
diff --git a/wp-admin/post-new.php b/wp-admin/post-new.php
index ec85d5518..61000583e 100644
--- a/wp-admin/post-new.php
+++ b/wp-admin/post-new.php
@@ -11,7 +11,7 @@ require_once('./admin.php');
 
 if ( !isset($_GET['post_type']) )
 	$post_type = 'post';
-elseif ( in_array( $_GET['post_type'], get_post_types( array('public' => true ) ) ) )
+elseif ( in_array( $_GET['post_type'], get_post_types( array('show_ui' => true ) ) ) || in_array( $_GET['post_type'], array( 'post', 'page' ) ) )
 	$post_type = $_GET['post_type'];
 else
 	wp_die( __('Invalid post type') );