diff --git a/wp-admin/admin-header.php b/wp-admin/admin-header.php
index f6384a50b4..bc4af483f5 100644
--- a/wp-admin/admin-header.php
+++ b/wp-admin/admin-header.php
@@ -12,6 +12,7 @@ if (!isset($_GET["page"])) require_once('admin.php');
 get_admin_page_title();
 $title = wp_specialchars( strip_tags( $title ) );
 wp_user_settings();
+wp_menu_unfold();
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" <?php do_action('admin_xml_ns'); ?> <?php language_attributes();
diff --git a/wp-admin/includes/misc.php b/wp-admin/includes/misc.php
index 48116d89e1..1479a63b66 100644
--- a/wp-admin/includes/misc.php
+++ b/wp-admin/includes/misc.php
@@ -363,9 +363,8 @@ function set_screen_options() {
 	}
 }
 
-add_action( 'admin_init', 'wp_menu_unfold' );
 function wp_menu_unfold() {
-	if ( isset($_GET['unfoldmenu']) && $user = get_current_user() ) {
+	if ( isset($_GET['unfoldmenu']) ) {
 		delete_user_setting('mfold');
 		wp_redirect( remove_query_arg( 'unfoldmenu', stripslashes($_SERVER['REQUEST_URI']) ) );
 	 	exit;
