diff --git a/wp-includes/class-wp-editor.php b/wp-includes/class-wp-editor.php
index b74e524c28..a00ce7522a 100644
--- a/wp-includes/class-wp-editor.php
+++ b/wp-includes/class-wp-editor.php
@@ -783,9 +783,9 @@ final class _WP_Editors {
 		<div id="search-panel"<?php if ( ! $show_internal ) echo ' style="display:none"'; ?>>
 			<div class="link-search-wrapper">
 				<label>
-					<span><?php _e( 'Search' ); ?></span>
+					<span><img class="waiting" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
+					<?php _e( 'Search' ); ?></span>
 					<input type="search" id="search-field" class="link-search-field" tabindex="60" autocomplete="off" />
-					<img class="waiting" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
 				</label>
 			</div>
 			<div id="search-results" class="query-results">
diff --git a/wp-includes/css/editor.dev.css b/wp-includes/css/editor.dev.css
index f89ee1cd38..bf1f8b9c6a 100644
--- a/wp-includes/css/editor.dev.css
+++ b/wp-includes/css/editor.dev.css
@@ -1291,7 +1291,7 @@ html[dir="rtl"] .wp-switch-editor {
 
 #wp-link .link-search-wrapper span {
 	float: left;
-	margin-top: 6px;
+	margin-top: 4px;
 }
 
 #wp-link .link-search-wrapper input[type="text"] {
@@ -1300,9 +1300,9 @@ html[dir="rtl"] .wp-switch-editor {
 }
 
 #wp-link .link-search-wrapper img.waiting {
-	margin: 8px 1px 0 4px;
-	float: left;
+	margin: 0;
 	display: none;
+	vertical-align: text-bottom;
 }
 
 #wp-link .link-target {
diff --git a/wp-includes/js/wplink.dev.js b/wp-includes/js/wplink.dev.js
index d0c4b9a0a0..d437d58a67 100644
--- a/wp-includes/js/wplink.dev.js
+++ b/wp-includes/js/wplink.dev.js
@@ -303,7 +303,7 @@ var wpLink;
 					return;
 
 				wpLink.lastSearch = search;
-				waiting = t.siblings('img.waiting').show();
+				waiting = t.parent().find('img.waiting').show();
 
 				rivers.search.change( search );
 				rivers.search.ajax( function(){ waiting.hide(); });