diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php
index 00fc5f8f2..96776d4e3 100644
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -241,7 +241,7 @@ endif; ?>
 
 <div id="categories-all" class="ui-tabs-panel">
 	<ul id="categorychecklist" class="list:category categorychecklist form-no-clear">
-		<?php wp_category_checklist($post->ID) ?>
+		<?php wp_category_checklist($post_ID) ?>
 	</ul>
 </div>
 
diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index 71b4ec255..7ed2d03d9 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -156,11 +156,15 @@ class Walker_Category_Checklist extends Walker {
 	}
 }
 
-function wp_category_checklist( $post_id ) {
+function wp_category_checklist( $post_id = 0 ) {
 	$walker = new Walker_Category_Checklist;
 
 	$args = array();
-	$args['selected_cats'] = wp_get_post_categories($post_id);
+	
+	if ( $post_id )
+		$args['selected_cats'] = wp_get_post_categories($post_id);
+	else
+		$args['selected_cats'] = array();
 	$args['popular_cats'] = get_terms( 'category', array( 'fields' => 'ids', 'orderby' => 'count', 'order' => 'DESC', 'number' => 10 ) );
 	$categories = get_categories('get=all');
 	$args = array($categories, 0, $args);