diff --git a/wp-admin/includes/nav-menu.php b/wp-admin/includes/nav-menu.php
index da5cf18e1..fe100a45f 100644
--- a/wp-admin/includes/nav-menu.php
+++ b/wp-admin/includes/nav-menu.php
@@ -149,7 +149,7 @@ function wp_nav_menu_item_link_metabox() {
  * @param string $post_type The post type object.
  */
 function wp_nav_menu_item_post_type_metabox( $object, $post_type ) {
-	$args = array( 'post_type' => $post_type['args']->name, );
+	$args = array( 'post_type' => $post_type['args']->name, 'post_status' => 'publish' );
 	
 	if ( 'attachment' == $post_type['args']->name )
 		$args['post_status'] = 'any';
diff --git a/wp-includes/nav-menu.php b/wp-includes/nav-menu.php
index 607bb3c8e..6f4c441e2 100644
--- a/wp-includes/nav-menu.php
+++ b/wp-includes/nav-menu.php
@@ -210,7 +210,7 @@ function wp_setup_nav_menu_item( $menu_item, $menu_item_type = null, $menu_item_
 			$menu_item->append = _x( $object->singular_label, 'nav menu item type' );
 
 			$menu_item->title = $menu_item->post_title;
-			$menu_item->url = get_post_permalink( $menu_item->ID );
+			$menu_item->url = get_permalink( $menu_item->ID );
 			$menu_item->target = '_none';
 			
 			$menu_item->attr_title = '';