Index: wp-admin/includes/template.php
===================================================================
--- wp-admin/includes/template.php	(revision 23707)
+++ wp-admin/includes/template.php	(working copy)
@@ -986,6 +986,8 @@
 function do_accordion_sections( $screen, $context, $object ) {
 	global $wp_meta_boxes;
 
+	wp_enqueue_script( 'accordion' );
+
 	if ( empty( $screen ) )
 		$screen = get_current_screen();
 	elseif ( is_string( $screen ) )
Index: wp-admin/js/accordion.js
===================================================================
--- wp-admin/js/accordion.js	(revision 23707)
+++ wp-admin/js/accordion.js	(working copy)
@@ -14,38 +14,19 @@
 		clicked.toggleClass( 'open' );
 		event.preventDefault();
 	});
-});
-jQuery(document).ready( function($) {
-	// Expand/Collapse
-	$('.accordion-section-title').on('click keydown', function( event ) {
-
-		if ( event.type === 'keydown' &&  13 !== event.which ) // enter
-				return;
-
-		var clicked = $( this ).closest( '.accordion-section' );
-
-		if ( clicked.hasClass('cannot-expand') )
-			return;
-
-		clicked.closest( '.accordion-container' ).find( '.accordion-section' ).not( clicked ).removeClass( 'open' );
-		clicked.toggleClass( 'open' );
-		event.preventDefault();
+	// Refresh selected accordion option when screen options are toggled
+	$('.hide-postbox-tog').click(function () {
+		accordion.init();
 	});
+	// Show the first accordion option by default
+	accordion.init();
 });
-jQuery(document).ready( function($) {
-	// Expand/Collapse
-	$('.accordion-section-title').on('click keydown', function( event ) {
-
-		if ( event.type === 'keydown' &&  13 !== event.which ) // enter
-				return;
-
-		var clicked = $( this ).closest( '.accordion-section' );
-
-		if ( clicked.hasClass('cannot-expand') )
-			return;
-
-		clicked.closest( '.accordion-container' ).find( '.accordion-section' ).not( clicked ).removeClass( 'open' );
-		clicked.toggleClass( 'open' );
-		event.preventDefault();
-	});
-});
\ No newline at end of file
+(function($){
+	accordion = {
+		init : function() {
+			var accordionOptions = $( '.accordion-container li.accordion-section' );
+			accordionOptions.removeClass('open');
+			accordionOptions.filter(':visible').first().addClass( 'open' );
+		}
+	};
+})(jQuery);
\ No newline at end of file
Index: wp-admin/js/nav-menu.js
===================================================================
--- wp-admin/js/nav-menu.js	(revision 23707)
+++ wp-admin/js/nav-menu.js	(working copy)
@@ -51,9 +51,6 @@
 			this.initAccessibility();
 
 			this.initToggles();
-
-			// Open first accordion option
-			this.initAccordion();
 		},
 
 		jQueryExtensions : function() {
@@ -265,12 +262,6 @@
 			});
 		},
 
-		initAccordion : function() {
-			var accordionOptions = $( '.accordion-container li.accordion-section' );
-			accordionOptions.removeClass('open');
-			accordionOptions.filter(':visible').first().addClass( 'open' );
-		},
-
 		initAccessibility : function() {
 			$( '.item-edit' ).off( 'focus' ).on( 'focus', function(){
 				$(this).on( 'keydown', function(e){
@@ -402,8 +393,6 @@
 			api.menuList.hideAdvancedMenuItemFields();
 
 			$('.hide-postbox-tog').click(function () {
-				api.initAccordion();
-
 				var hidden = $( '.accordion-container li.accordion-section' ).filter(':hidden').map(function() { return this.id; }).get().join(',');
 				$.post(ajaxurl, {
 					action: 'closed-postboxes',
Index: wp-admin/js/postbox.js
===================================================================
--- wp-admin/js/postbox.js	(revision 23707)
+++ wp-admin/js/postbox.js	(working copy)
@@ -144,6 +144,9 @@
 			});
 
 			if ( side.length ) {
+				if ($('#postbox-container-1').find('accordion-container'))
+					return;
+
 				if ( side.children('.postbox:visible').length )
 					side.removeClass('empty-container');
 				else if ( $('#postbox-container-1').css('width') == '280px' )
Index: wp-admin/nav-menus.php
===================================================================
--- wp-admin/nav-menus.php	(revision 23707)
+++ wp-admin/nav-menus.php	(working copy)
@@ -23,7 +23,6 @@
 	wp_die( __( 'Cheatin’ uh?' ) );
 
 wp_enqueue_script( 'nav-menu' );
-wp_enqueue_script( 'accordion' );
 
 if ( wp_is_mobile() )
 	wp_enqueue_script( 'jquery-touch-punch' );
Index: wp-admin/css/wp-admin.css
===================================================================
--- wp-admin/css/wp-admin.css	(revision 23707)
+++ wp-admin/css/wp-admin.css	(working copy)
@@ -7221,10 +7221,6 @@
 	margin: 13px 0;
 }
 
-#nav-menu-meta .accordion-section-content {
-	padding: 18px 13px;
-}
-
 #nav-menu-meta .button-controls {
 	margin-bottom: 0;
 }
@@ -8889,10 +8885,14 @@
 
 .accordion-section-content {
 	display: none;
-	padding: 10px 20px 15px;
+	padding: 8px 13px 13px;
 	overflow: hidden;
 }
 
+#submitdiv .accordion-section-content {
+	padding: 0;
+}
+
 .accordion-section-title {
 	margin: 0;
 	padding: 15px 20px;
@@ -8937,7 +8937,8 @@
 	display: none;
 }
 
-.control-section .accordion-section-title {
+.control-section .accordion-section-title,
+#poststuff .control-section .accordion-section-title {
 	padding: 10px 20px;
 	font-size: 15px;
 	font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
@@ -8963,7 +8964,11 @@
 .control-section:hover .accordion-section-title,
 .control-section .accordion-section-title:hover,
 .control-section.open .accordion-section-title,
-.control-section .accordion-section-title:focus {
+.control-section .accordion-section-title:focus,
+#poststuff .control-section:hover .accordion-section-title,
+#poststuff .control-section .accordion-section-title:hover,
+#poststuff .control-section.open .accordion-section-title,
+#poststuff .control-section .accordion-section-title:focus {
 	color: #fff;
 	text-shadow: 0 -1px 0 #333;
 	background: #808080;