diff --git a/wp-admin/includes/plugin.php b/wp-admin/includes/plugin.php
index 39a65f7221..430e6768ac 100644
--- a/wp-admin/includes/plugin.php
+++ b/wp-admin/includes/plugin.php
@@ -616,8 +616,8 @@ function get_plugin_page_hookname( $plugin_page, $parent_page ) {
 		else
 			if ( isset( $admin_page_hooks[$parent] ))
 				$page_type = $admin_page_hooks[$parent];
-	} else if ( isset( $admin_page_hooks[$parent_page] ) ) {
-		$page_type = $admin_page_hooks[$parent_page];
+	} else if ( isset( $admin_page_hooks[$parent] ) ) {
+		$page_type = $admin_page_hooks[$parent];
 	}
 
 	$plugin_name = preg_replace( '!\.php!', '', $plugin_page );
diff --git a/wp-admin/menu.php b/wp-admin/menu.php
index 38d657964c..22212dbe34 100644
--- a/wp-admin/menu.php
+++ b/wp-admin/menu.php
@@ -75,6 +75,11 @@ $menu[25] = array( __('Plugins'), 'activate_plugins', 'plugins.php' );
 	$submenu['plugins.php'][10] = array( __('Plugin Editor'), 'edit_plugins', 'plugin-editor.php' );
 	$submenu['plugins.php'][15] = array(__('Install Plugins'), 'install_plugins', 'plugin-install.php');
 
+// Back-compat for old top-levels
+$_wp_real_parent_file['post.php'] = 'edit.php'; 
+$_wp_real_parent_file['post-new.php'] = 'edit.php';
+$_wp_real_parent_file['edit-comments.php'] = 'edit.php';
+
 do_action('_admin_menu');
 
 // Create list of page plugin hook names.