diff --git a/wp-admin/includes/widgets.php b/wp-admin/includes/widgets.php
index 4c8cda059..b6d6c06aa 100644
--- a/wp-admin/includes/widgets.php
+++ b/wp-admin/includes/widgets.php
@@ -31,7 +31,7 @@ function wp_list_widgets() {
 		if ( in_array( $widget['callback'], $done, true ) ) // We already showed this multi-widget
 			continue;
 
-		$sidebar = is_active_widget( $widget['callback'], $widget['id'] );
+		$sidebar = is_active_widget( $widget['callback'], $widget['id'], false, false );
 		$done[] = $widget['callback'];
 
 		if ( ! isset( $widget['params'][0] ) )
diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php
index 465d6d82f..460cbcc5a 100644
--- a/wp-includes/script-loader.php
+++ b/wp-includes/script-loader.php
@@ -330,7 +330,7 @@ function wp_default_scripts( &$scripts ) {
 		$scripts->add( 'media-upload', "/wp-admin/js/media-upload$suffix.js", array( 'thickbox' ), '20090114' );
 		$scripts->add_data( 'media-upload', 'group', 1 );
 
-		$scripts->add( 'admin-widgets', "/wp-admin/js/widgets$suffix.js", array( 'jquery-ui-sortable', 'jquery-ui-draggable' ), '20090502' );
+		$scripts->add( 'admin-widgets', "/wp-admin/js/widgets$suffix.js", array( 'jquery-ui-sortable', 'jquery-ui-draggable' ), '20090503' );
 		$scripts->add_data( 'admin-widgets', 'group', 1 );
 
 		$scripts->add( 'word-count', "/wp-admin/js/word-count$suffix.js", array( 'jquery' ), '20090422' );
diff --git a/wp-includes/widgets.php b/wp-includes/widgets.php
index e13a6a61d..40d249e6a 100644
--- a/wp-includes/widgets.php
+++ b/wp-includes/widgets.php
@@ -816,15 +816,19 @@ function dynamic_sidebar($index = 1) {
  * @param callback Optional, Widget callback to check.
  * @param int $widget_id Optional, but needed for checking. Widget ID.
  * @param string $id_base Optional, the base ID of a widget created by extending WP_Widget.
+ * @param bool $skip_inactive Optional, whether to check in 'wp_inactive_widgets'.
  * @return mixed false if widget is not active or id of sidebar in which the widget is active.
  */
-function is_active_widget($callback = false, $widget_id = false, $id_base = false) {
+function is_active_widget($callback = false, $widget_id = false, $id_base = false, $skip_inactive = true) {
 	global $wp_registered_widgets;
 
 	$sidebars_widgets = wp_get_sidebars_widgets(false);
 
 	if ( is_array($sidebars_widgets) ) {
 		foreach ( $sidebars_widgets as $sidebar => $widgets ) {
+			if ( $skip_inactive && 'wp_inactive_widgets' == $sidebar )
+				continue;
+			
 			if ( is_array($widgets) ) {
 				foreach ( $widgets as $widget ) {
 					if ( ( $callback && isset($wp_registered_widgets[$widget]['callback']) && $wp_registered_widgets[$widget]['callback'] == $callback ) || ( $id_base && preg_replace( '/-[0-9]+$/', '', $widget ) == $id_base ) ) {