Index: wp-admin/css/wp-admin-rtl.dev.css
===================================================================
--- wp-admin/css/wp-admin-rtl.dev.css	(revision 18630)
+++ wp-admin/css/wp-admin-rtl.dev.css	(working copy)
@@ -2160,7 +2160,7 @@
 	clear: left;
 }
 
-#wp_inactive_widgets .widget {
+.sidebar-inactive .widget {
 	float: right;
 }
 
@@ -2172,7 +2172,7 @@
 	float: right;
 }
 
-#wp_inactive_widgets .widget-placeholder {
+.sidebar-inactive .widget-placeholder {
 	float: right;
 }
 
@@ -2188,5 +2188,3 @@
 .sidebar-name-arrow {
 	float: left;
 }
-
-
Index: wp-admin/css/wp-admin.dev.css
===================================================================
--- wp-admin/css/wp-admin.dev.css	(revision 18630)
+++ wp-admin/css/wp-admin.dev.css	(working copy)
@@ -7284,19 +7284,29 @@
 	width: 300px;
 }
 
+.sidebar-inactive .sidebar-description {
+	padding:15px 15px 10px 15px;
+}
+
 .widget-liquid-right .widget,
-#wp_inactive_widgets .widget,
+.sidebar-inactive .widget,
 .widget-liquid-right .sidebar-description {
 	width: 250px;
 	margin: 0 auto 20px;
 	overflow: hidden;
 }
 
+.sidebar-inactive .sidebar-name,
+.sidebar-inactive .sidebar-description {
+	opacity: 0.5;
+}
+
+
 .widget-liquid-right .sidebar-description {
 	margin-bottom: 10px;
 }
 
-#wp_inactive_widgets .widget {
+.sidebar-inactive .widget {
 	margin: 0 10px 20px;
 	float: left;
 }
@@ -7370,7 +7380,7 @@
 	box-shadow: none;
 }
 
-#wp_inactive_widgets {
+.sidebar-inactive {
 	padding: 5px 5px 0;
 }
 
@@ -7403,7 +7413,7 @@
 	width: 250px;
 }
 
-#wp_inactive_widgets .widget-placeholder {
+.sidebar-inactive .widget-placeholder {
 	margin: 0 10px 20px;
 	float: left;
 }
@@ -7542,7 +7552,7 @@
 
 #available-widgets .widget-control-edit .add,
 #widgets-right .widget-control-edit .edit,
-#wp_inactive_widgets .widget-control-edit .edit {
+.sidebar-inactive .widget-control-edit .edit {
 	display: inline;
 }
 
@@ -7636,4 +7646,3 @@
 .widgets_access .widget .widget-top {
 	cursor: default;
 }
-
Index: wp-admin/css/ie.dev.css
===================================================================
--- wp-admin/css/ie.dev.css	(revision 18630)
+++ wp-admin/css/ie.dev.css	(working copy)
@@ -408,7 +408,7 @@
 	width: 99%;
 }
 
-#wp_inactive_widgets {
+.sidebar-inactive .widgets-sortables {
 	padding-bottom: 8px;
 }
 
@@ -437,7 +437,7 @@
 }
 
 .widget-liquid-right .widget,
-#wp_inactive_widgets .widget {
+.sidebar-inactive .widget {
 	position: relative;
 }
 
Index: wp-admin/widgets.php
===================================================================
--- wp-admin/widgets.php	(revision 18630)
+++ wp-admin/widgets.php	(working copy)
@@ -50,25 +50,16 @@
 if ( empty( $sidebars_widgets ) )
 	$sidebars_widgets = wp_get_widget_defaults();
 
-// register the inactive_widgets area as sidebar
-register_sidebar(array(
-	'name' => __('Inactive Widgets'),
-	'id' => 'wp_inactive_widgets',
-	'class' => 'inactive',
-	'description' => '',
-	'before_widget' => '',
-	'after_widget' => '',
-	'before_title' => '',
-	'after_title' => '',
-));
+foreach ( $sidebars_widgets as $sidebar_id => $widgets ) {
+	if ( 'wp_inactive_widgets' == $sidebar_id )
+		continue;
 
-foreach ( $sidebars_widgets as $sidebar_id => $widgets ) {
 	if ( empty( $wp_registered_sidebars[ $sidebar_id ] ) && ! empty( $widgets ) ) {
 		// register the inactive_widgets area as sidebar
 		register_sidebar(array(
 			'name' => __( 'Inactive Widgets (Previous Theme)' ),
 			'id' => $sidebar_id,
-			'class' => 'orphaned',
+			'class' => 'inactive',
 			'description' => __( 'This is a left over sidebar from an old theme and does not show anywhere on your site' ),
 			'before_widget' => '',
 			'after_widget' => '',
@@ -78,6 +69,18 @@
 	}
 }
 
+// register the inactive_widgets area as sidebar
+register_sidebar(array(
+	'name' => __('Inactive Widgets'),
+	'id' => 'wp_inactive_widgets',
+	'class' => 'inactive',
+	'description' => 'Drag widgets here to remove them from the sidebar but keep their settings.',
+	'before_widget' => '',
+	'after_widget' => '',
+	'before_title' => '',
+	'after_title' => '',
+));
+
 retrieve_widgets();
 
 if ( count($wp_registered_sidebars) == 1 ) {
@@ -228,7 +231,7 @@
 <?php
 	foreach ( $wp_registered_sidebars as $sbname => $sbvalue ) {
 		echo "\t\t<tr><td><label><input type='radio' name='sidebar' value='" . esc_attr($sbname) . "'" . checked( $sbname, $sidebar, false ) . " /> $sbvalue[name]</label></td><td>";
-		if ( 'wp_inactive_widgets' == $sbname ) {
+		if ( 'wp_inactive_widgets' == $sbname || 'orphaned_widgets' == substr( $sbname, 0, 16 ) ) {
 			echo '&nbsp;';
 		} else {
 			if ( !isset($sidebars_widgets[$sbname]) || !is_array($sidebars_widgets[$sbname]) ) {
@@ -317,17 +320,30 @@
 		<br class="clear" />
 	</div>
 
-	<div class="widgets-holder-wrap">
-		<div class="sidebar-name">
-		<div class="sidebar-name-arrow"><br /></div>
-		<h3><?php _e('Inactive Widgets'); ?>
-		<span><img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" class="ajax-feedback" title="" alt="" /></span></h3></div>
-		<div class="widget-holder inactive">
-		<p class="description"><?php _e('Drag widgets here to remove them from the sidebar but keep their settings.'); ?></p>
-		<?php wp_list_widget_controls('wp_inactive_widgets'); ?>
-		<br class="clear" />
+<?php
+foreach ( $wp_registered_sidebars as $sidebar => $registered_sidebar ) {
+	if ( 'wp_inactive_widgets' == $sidebar || 'orphaned_widgets' == substr( $sidebar, 0, 16 ) ) {
+		$wrap_class = 'widgets-holder-wrap';
+		if ( !empty( $registered_sidebar['class'] ) )
+			$wrap_class .= ' sidebar-' . $registered_sidebar['class'];
+
+?>
+
+		<div class="<?php esc_attr_e( $wrap_class ); ?>">
+			<div class="sidebar-name">
+				<div class="sidebar-name-arrow"><br /></div>
+				<h3><?php esc_html_e( $registered_sidebar['name'] ); ?>
+					<span><img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" class="ajax-feedback" title="" alt="" /></span>
+				</h3>
+			</div>
+				<?php wp_list_widget_controls( $registered_sidebar['id'] ); ?>
+				<br class="clear" />
 		</div>
-	</div>
+<?php
+	}
+}
+?>
+
 </div>
 </div>
 
@@ -336,7 +352,7 @@
 <?php
 $i = 0;
 foreach ( $wp_registered_sidebars as $sidebar => $registered_sidebar ) {
-	if ( 'wp_inactive_widgets' == $sidebar )
+	if ( 'wp_inactive_widgets' == $sidebar || 'orphaned_widgets' == substr( $sidebar, 0, 16 ) )
 		continue;
 
 	$wrap_class = 'widgets-holder-wrap';