diff --git a/src/js/_enqueues/lib/image-edit.js b/src/js/_enqueues/lib/image-edit.js
index d1603051d7078..9292a0bebd281 100644
--- a/src/js/_enqueues/lib/image-edit.js
+++ b/src/js/_enqueues/lib/image-edit.js
@@ -905,11 +905,11 @@
 		setTimeout( function() {
 			var elementToSetFocusTo = $( '.notice[role="alert"]' );
 
-			if ( ! elementToSetFocusTo.length ) {
-				elementToSetFocusTo = $( '.imgedit-wrap' ).find( ':tabbable:first' );
+			if ( elementToSetFocusTo.length ) {
+				elementToSetFocusTo.attr( 'tabindex', '-1' ).trigger( 'focus' );
+			} else {
+				$( '.imgedit-wrap' ).find( ':tabbable:first' ).trigger( 'focus' );
 			}
-
-			elementToSetFocusTo.attr( 'tabindex', '-1' ).trigger( 'focus' );
 		}, 100 );
 	},