diff --git a/wp-admin/includes/plugin.php b/wp-admin/includes/plugin.php
index 6c29637e2..77b30d465 100644
--- a/wp-admin/includes/plugin.php
+++ b/wp-admin/includes/plugin.php
@@ -488,7 +488,7 @@ function get_admin_page_parent( $parent = '' ) {
 	global $_wp_menu_nopriv;
 	global $_wp_submenu_nopriv;
 
-	if ( !empty ( $parent ) ) {
+	if ( !empty ( $parent ) && 'admin.php' != $parent ) {
 		if ( isset( $_wp_real_parent_file[$parent] ) )
 			$parent = $_wp_real_parent_file[$parent];
 		return $parent;
diff --git a/wp-admin/menu-header.php b/wp-admin/menu-header.php
index 311f3529f..1161932d4 100644
--- a/wp-admin/menu-header.php
+++ b/wp-admin/menu-header.php
@@ -87,7 +87,7 @@ function _wp_menu_output( &$menu, &$submenu, $submenu_as_parent = true ) {
 				$menu_hook = get_plugin_page_hook($sub_item[2], $item[2]);
 
 				if ( file_exists(WP_PLUGIN_DIR . "/{$sub_item[2]}") || ! empty($menu_hook) ) {
-					if ( 'admin.php' == $pagenow )
+					if ( 'admin.php' == $pagenow || !file_exists(WP_PLUGIN_DIR . "/$parent_file") )
 						echo "\n\t\t<li$class><a href='admin.php?page={$sub_item[2]}'$class>{$sub_item[0]}</a></li>";
 					else
 						echo "\n\t\t<li$class><a href='{$item[2]}?page={$sub_item[2]}'$class>{$sub_item[0]}</a></li>";