Ticket #31295: 31295.diff

src/wp-admin/js/customize-widgets.js

@@ -250 +250 @@
 
                 // Adds a selected widget to the sidebar
                 submit: function( widgetTpl ) {
-                        var widgetId, widget;
+                        var widgetId, widget, widgetFormControl;
 
                         if ( ! widgetTpl ) {
                                 widgetTpl = this.selected;
@@ -268 +268 @@
                                 return;
                         }
 
-                        this.currentSidebarControl.addWidget( widget.get( 'id_base' ) );
+                        widgetFormControl = this.currentSidebarControl.addWidget( widget.get( 'id_base' ) );
+                        if ( widgetFormControl ) {
+                                widgetFormControl.focus();
+                        }
 
                         this.close();
                 },
@@ -1839 +1842 @@
 
                         controlContainer.slideDown( function() {
                                 if ( isExistingWidget ) {
-                                        widgetFormControl.expand();
                                         widgetFormControl.updateWidget( {
                                                 instance: widgetFormControl.setting(),
                                                 complete: function( error ) {
                                                         if ( error ) {
                                                                 throw error;
                                                         }
-                                                        widgetFormControl.focus();
                                                 }
                                         } );
-                                } else {
-                                        widgetFormControl.focus();
                                 }
                         } );