diff --git a/wp-admin/includes/dashboard.php b/wp-admin/includes/dashboard.php
index 5a5d2fb15..ceffea88c 100644
--- a/wp-admin/includes/dashboard.php
+++ b/wp-admin/includes/dashboard.php
@@ -58,7 +58,7 @@ function wp_dashboard_setup() {
 	}
 
 	// WP Plugins Widget
-	if ( is_blog_admin() && current_user_can( 'install_plugins' ) )
+	if ( ( is_blog_admin() && current_user_can( 'install_plugins' ) ) || ( is_network_admin() && current_user_can( 'manage_network_plugins' ) ) )
 		wp_add_dashboard_widget( 'dashboard_plugins', __( 'Plugins' ), 'wp_dashboard_plugins' );
 
 	// QuickPress Widget
@@ -100,10 +100,14 @@ function wp_dashboard_setup() {
 	wp_add_dashboard_widget( 'dashboard_secondary', $widget_options['dashboard_secondary']['title'], 'wp_dashboard_secondary', 'wp_dashboard_secondary_control' );
 
 	// Hook to register new widgets
-	do_action( 'wp_dashboard_setup' );
-
 	// Filter widget order
-	$dashboard_widgets = apply_filters( 'wp_dashboard_widgets', array() );
+	if ( is_network_admin() ) {
+		do_action( 'wp_network_dashboard_setup' );
+		$dashboard_widgets = apply_filters( 'wp_network_dashboard_widgets', array() );
+	} else {
+		do_action( 'wp_dashboard_setup' );
+		$dashboard_widgets = apply_filters( 'wp_dashboard_widgets', array() );
+	}
 
 	foreach ( $dashboard_widgets as $widget_id ) {
 		$name = empty( $wp_registered_widgets[$widget_id]['all_link'] ) ? $wp_registered_widgets[$widget_id]['name'] : $wp_registered_widgets[$widget_id]['name'] . " <a href='{$wp_registered_widgets[$widget_id]['all_link']}' class='edit-box open-box'>" . __('View all') . '</a>';
diff --git a/wp-admin/network/index-extra.php b/wp-admin/network/index-extra.php
new file mode 100644
index 000000000..d778541bc
--- /dev/null
+++ b/wp-admin/network/index-extra.php
@@ -0,0 +1,5 @@
+<?php
+
+require_once( './admin.php' );
+
+require( '../index-extra.php' );
diff --git a/wp-admin/network/index.php b/wp-admin/network/index.php
index c2ac6231b..8a659ce19 100644
--- a/wp-admin/network/index.php
+++ b/wp-admin/network/index.php
@@ -7,15 +7,19 @@
  * @since 3.0.0
  */
 
+/** Load WordPress Bootstrap */
 require_once( './admin.php' );
 
+/** Load WordPress dashboard API */
+require_once(ABSPATH . 'wp-admin/includes/dashboard.php');
+
 if ( !is_multisite() )
 	wp_die( __( 'Multisite support is not enabled.' ) );
 
 if ( ! current_user_can( 'manage_network' ) )
 	wp_die( __( 'You do not have permission to access this page.' ) );
 
-$title = __( 'Network Admin' );
+$title = __( 'Network Dashboard' );
 $parent_file = 'index.php';
 
 add_contextual_help($current_screen,
@@ -28,49 +32,29 @@ add_contextual_help($current_screen,
 	'<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
 );
 
+wp_dashboard_setup();
+
+wp_enqueue_script( 'dashboard' );
+wp_admin_css( 'dashboard' );
+add_thickbox();
+
+add_screen_option('layout_columns', array('max' => 4, 'default' => 2) );
+
 require_once( '../admin-header.php' );
 
-$c_users = get_user_count();
-$c_blogs = get_blog_count();
-
-$user_text = sprintf( _n( '%s user', '%s users', $c_users ), number_format_i18n( $c_users ) );
-$blog_text = sprintf( _n( '%s site', '%s sites', $c_blogs ), number_format_i18n( $c_blogs ) );
-
-$sentence = sprintf( __( 'You have %1$s and %2$s.' ), $blog_text, $user_text );
 ?>
 
 <div class="wrap">
-	<?php screen_icon(); ?>
-	<h2><?php echo esc_html( $title ); ?></h2>
+<?php screen_icon(); ?>
+<h2><?php echo esc_html( $title ); ?></h2>
 
-	<ul class="subsubsub">
-	<li><a href="sites.php#form-add-site"><?php _e( 'Create a New Site' ); ?></a> |</li>
-	<li><a href="users.php#form-add-user"><?php _e( 'Create a New User' ); ?></a></li>
-	</ul>
-	<br class="clear" />
+<div id="dashboard-widgets-wrap">
 
-	<p class="youhave"><?php echo $sentence; ?></p>
-	<?php do_action( 'wpmuadminresult', '' ); ?>
+<?php wp_dashboard(); ?>
 
-	<form name="searchform" action="users.php" method="get">
-		<p>
-			<input type="hidden" name="action" value="users" />
-			<input type="text" name="s" value="" size="17" />
-			<input class="button" type="submit" name="submit" value="<?php esc_attr_e( 'Search Users' ); ?>" />
-		</p>
-	</form>
+<div class="clear"></div>
+</div><!-- dashboard-widgets-wrap -->
 
-	<form name="searchform" action="sites.php" method="get">
-		<p>
-			<input type="hidden" name="action" value="blogs" />
-			<input type="hidden" name="searchaction" value="name" />
-			<input type="text" name="s" value="" size="17" />
-			<input class="button" type="submit" name="blog_name" value="<?php esc_attr_e( 'Search Sites' ); ?>" />
-		</p>
-	</form>
-
-	<?php do_action( 'mu_rightnow_end' ); ?>
-	<?php do_action( 'mu_activity_box_end' ); ?>
-</div>
+</div><!-- wrap -->
 
 <?php include( '../admin-footer.php' ); ?>