diff --git a/src/wp-admin/js/customize-widgets.js b/src/wp-admin/js/customize-widgets.js
index 857d6f5239..0a3909a534 100644
--- a/src/wp-admin/js/customize-widgets.js
+++ b/src/wp-admin/js/customize-widgets.js
@@ -1588,6 +1588,9 @@
 				} );
 
 				this.$sectionContent.find( '.first-widget .move-widget' ).focus();
+				this.$sectionContent.find( '.add-new-widget' ).prop( 'tabIndex', -1 );
+			} else {
+				this.$sectionContent.find( '.add-new-widget' ).prop( 'tabIndex', 0 );
 			}
 		},