diff --git a/src/wp-admin/css/widgets.css b/src/wp-admin/css/widgets.css
index 0a8cd92bb5..3befaf29a8 100644
--- a/src/wp-admin/css/widgets.css
+++ b/src/wp-admin/css/widgets.css
@@ -350,6 +350,10 @@ div#widgets-right .closed .widgets-sortables {
 	display: none;
 }
 
+.js .widgets-holder-wrap.closed .widget.ui-sortable-helper {
+	display: block;
+}
+
 /* Hide Widget Settings by Default */
 .widget-inside,
 .widget-description {
@@ -506,6 +510,10 @@ div#widgets-right .widget-top:hover,
 	cursor: pointer;
 }
 
+#available-widgets .widget.ui-draggable-dragging .widget-top {
+	cursor: move;
+}
+
 /* =Media Queries
 -------------------------------------------------------------- */
 
diff --git a/src/wp-admin/js/common.js b/src/wp-admin/js/common.js
index d63c07724d..574ec09451 100644
--- a/src/wp-admin/js/common.js
+++ b/src/wp-admin/js/common.js
@@ -860,7 +860,7 @@ $(document).ready( function() {
 	window.wpResponsive.init();
 	setPinMenu();
 
-	$document.on( 'wp-window-resized.pin-menu postboxes-columnchange.pin-menu postbox-toggled.pin-menu wp-collapse-menu.pin-menu wp-scroll-start.pin-menu', setPinMenu );
+	$document.on( 'wp-pin-menu wp-window-resized.pin-menu postboxes-columnchange.pin-menu postbox-toggled.pin-menu wp-collapse-menu.pin-menu wp-scroll-start.pin-menu', setPinMenu );
 });
 
 // Fire a custom jQuery event at the end of window resize
diff --git a/src/wp-admin/js/widgets.js b/src/wp-admin/js/widgets.js
index 46b064a780..7fdd02957b 100644
--- a/src/wp-admin/js/widgets.js
+++ b/src/wp-admin/js/widgets.js
@@ -1,6 +1,7 @@
 /*global ajaxurl, isRtl */
 var wpWidgets;
 (function($) {
+	var $document = $( document );
 
 wpWidgets = {
 
@@ -22,10 +23,13 @@ wpWidgets = {
 			} else {
 				$wrap.addClass('closed');
 			}
+
+			$document.triggerHandler( 'wp-pin-menu' );
 		});
 
 		$('#widgets-left .sidebar-name').click( function() {
 			$(this).closest('.widgets-holder-wrap').toggleClass('closed');
+			$document.triggerHandler( 'wp-pin-menu' );
 		});
 
 		$(document.body).bind('click.widgets-toggle', function(e) {
@@ -89,7 +93,7 @@ wpWidgets = {
 			distance: 2,
 			helper: 'clone',
 			zIndex: 100,
-			containment: 'document',
+			containment: '#wpwrap',
 			start: function( event, ui ) {
 				var chooser = $(this).find('.widgets-chooser');
 
@@ -119,7 +123,7 @@ wpWidgets = {
 			handle: '> .widget-top > .widget-title',
 			cursor: 'move',
 			distance: 2,
-			containment: 'document',
+			containment: '#wpwrap',
 			start: function( event, ui ) {
 				var height, $this = $(this),
 					$wrap = $this.parent(),
@@ -174,7 +178,7 @@ wpWidgets = {
 
 					wpWidgets.save( $widget, 0, 0, 1 );
 					$widget.find('input.add_new').val('');
-					$( document ).trigger( 'widget-added', [ $widget ] );
+					$document.trigger( 'widget-added', [ $widget ] );
 				}
 
 				$sidebar = $widget.parent();
@@ -381,7 +385,7 @@ wpWidgets = {
 				if ( r && r.length > 2 ) {
 					$( 'div.widget-content', widget ).html( r );
 					wpWidgets.appendTitle( widget );
-					$( document ).trigger( 'widget-updated', [ widget ] );
+					$document.trigger( 'widget-updated', [ widget ] );
 				}
 			}
 			if ( order ) {
@@ -446,7 +450,7 @@ wpWidgets = {
 		// No longer "new" widget
 		widget.find( 'input.add_new' ).val('');
 
-		$( document ).trigger( 'widget-added', [ widget ] );
+		$document.trigger( 'widget-added', [ widget ] );
 
 		/*
 		 * Check if any part of the sidebar is visible in the viewport. If it is, don't scroll.
@@ -489,6 +493,6 @@ wpWidgets = {
 	}
 };
 
-$(document).ready( function(){ wpWidgets.init(); } );
+$document.ready( function(){ wpWidgets.init(); } );
 
 })(jQuery);