diff --git a/src/wp-content/themes/twentyseventeen/assets/js/global.js b/src/wp-content/themes/twentyseventeen/assets/js/global.js
index 3d893e17cd..fa29a19b79 100644
--- a/src/wp-content/themes/twentyseventeen/assets/js/global.js
+++ b/src/wp-content/themes/twentyseventeen/assets/js/global.js
@@ -27,7 +27,7 @@
 		resizeTimer;
 
 	// Ensure the sticky navigation doesn't cover current focused links.
-	$( '#content a, #colophon a' ).focus( function() {
+	$( 'a[href], area[href], input:not([disabled]), select:not([disabled]), textarea:not([disabled]), button:not([disabled]), iframe, object, embed, [tabindex], [contenteditable]', '.site-content-contain' ).filter( ':visible' ).focus( function() {
 		if ( $navigation.hasClass( 'site-navigation-fixed' ) ) {
 			var windowScrollTop = $( window ).scrollTop(),
 				fixedNavHeight = $navigation.height(),
@@ -40,7 +40,7 @@
 			}
 
 			if ( offsetDiff < fixedNavHeight ) {
-				$( window ).scrollTo( itemScrollTop - ( fixedNavHeight + 50 ), 600 );
+				$( window ).scrollTo( itemScrollTop - ( fixedNavHeight + 50 ), 0 );
 			}
 		}
 	});