diff --git a/wp-admin/menu-header.php b/wp-admin/menu-header.php
index 83b90ad4db..fd58e11845 100644
--- a/wp-admin/menu-header.php
+++ b/wp-admin/menu-header.php
@@ -102,7 +102,8 @@ 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 || !file_exists(WP_PLUGIN_DIR . "/$parent_file") )
+					// If admin.php is the current page or if the parent exists as a file in the plugins or admin dir
+					if ( 'admin.php' == $pagenow || ( (!file_exists(WP_PLUGIN_DIR . "/{$item[2]}") || is_dir(WP_PLUGIN_DIR . "/{$item[2]}") ) && !file_exists($item[2])) )
 						echo "<li$class><a href='admin.php?page={$sub_item[2]}'$class>{$sub_item[0]}</a></li>";
 					else
 						echo "<li$class><a href='{$item[2]}?page={$sub_item[2]}'$class>{$sub_item[0]}</a></li>";