diff --git a/wp-admin/widgets.css b/wp-admin/widgets.css
index fc5acfcfbb..54b21e6d84 100644
--- a/wp-admin/widgets.css
+++ b/wp-admin/widgets.css
@@ -3,7 +3,6 @@ body {
 }
 
 #sbadmin #zones {
-	width: <?php echo constant( 'WP_WIDGETS_WIDTH' ); ?>px;
 	-moz-user-select: none;
 	-khtml-user-select: none;
 	user-select: none;
@@ -30,7 +29,6 @@ body {
 .dropzone ul {
 	list-style-type: none;
 	width: 240px;
-	height: <?php echo constant( 'WP_WIDGETS_HEIGHT' ); ?>px;
 	float: left;
 	margin: 0;
 	padding: 0;
diff --git a/wp-admin/widgets.php b/wp-admin/widgets.php
index 54609cb7cb..1148b0e38d 100644
--- a/wp-admin/widgets.php
+++ b/wp-admin/widgets.php
@@ -14,10 +14,15 @@ function wp_widgets_admin_head() {
 	define( 'WP_WIDGETS_WIDTH', 1 + 262 * ( count( $wp_registered_sidebars ) ) );
 	define( 'WP_WIDGETS_HEIGHT', 35 * ( count( $wp_registered_widgets ) ) );
 ?>
+	<link rel="stylesheet" href="widgets.css?version=<?php bloginfo('version'); ?>" type="text/css" />
 	<style type="text/css">
-	<?php include dirname( __FILE__ ) . '/widgets.css'; ?>
+		.dropzone ul { height: <?php echo constant( 'WP_WIDGETS_HEIGHT' ); ?>px; }
+		#sbadmin #zones { width: <?php echo constant( 'WP_WIDGETS_WIDTH' ); ?>px; }
 	</style>
+<?php if ( ('rtl' == get_bloginfo('text_direction')) ) : ?>
+	<link rel="stylesheet" href="widgets-rtl.css?version=<?php bloginfo('version'); ?>" type="text/css" />
 <?php
+	endif;
 }
 
 add_action( 'admin_head', 'wp_widgets_admin_head' );
@@ -219,7 +224,7 @@ if ( isset( $_POST['action'] ) ) {
 			<div id="controls">
 			<?php foreach ( $wp_registered_widget_controls as $name => $widget ) { ?>
 				<div class="hidden" id="<?php echo $widget['id']; ?>control">
-					<span class="controlhandle"><?php echo $name; ?></span>
+					<span class="controlhandle"><?php echo $widget['name']; ?></span>
 					<span id="<?php echo $widget['id']; ?>closer" class="controlcloser">&#215;</span>
 					<div class="controlform">
 					<?php call_user_func_array( $widget['callback'], $widget['params'] ); ?>