Index: plugin.php
===================================================================
--- plugin.php	(revision 28200)
+++ plugin.php	(working copy)
@@ -1439,9 +1439,16 @@
 function menu_page_url($menu_slug, $echo = true) {
 	global $_parent_pages;
 
-	if ( isset( $_parent_pages[$menu_slug] ) ) {
+	if ( isset( $_parent_pages[$menu_slug] ) && is_network_admin() ) {
 		$parent_slug = $_parent_pages[$menu_slug];
 		if ( $parent_slug && ! isset( $_parent_pages[$parent_slug] ) ) {
+			$url = network_admin_url( add_query_arg( 'page', $menu_slug, $parent_slug ) );
+		} else {
+			$url = network_admin_url( 'admin.php?page=' . $menu_slug );
+		}
+	} else if ( isset( $_parent_pages[$menu_slug] ) && ! is_network_admin() ) {
+		$parent_slug = $_parent_pages[$menu_slug];
+		if ( $parent_slug && ! isset( $_parent_pages[$parent_slug] ) ) {
 			$url = admin_url( add_query_arg( 'page', $menu_slug, $parent_slug ) );
 		} else {
 			$url = admin_url( 'admin.php?page=' . $menu_slug );
@@ -1458,6 +1465,7 @@
 	return $url;
 }
 
+
 //
 // Pluggable Menu Support -- Private
 //