diff --git a/ext/index/theme.php b/ext/index/theme.php
index 0a4b1fa8..bd00a212 100644
--- a/ext/index/theme.php
+++ b/ext/index/theme.php
@@ -80,12 +80,12 @@ and of course start organising your images :-)
 		$h_search_link = make_link();
 		$h_search = "
 			<p><form action='$h_search_link' method='GET'>
-				<input class='search_input' id='search_input' name='search' type='text'
+				<input class='tag_autocomplete search_input' id='search_input' name='search' type='text'
 						value='$h_search_string' autocomplete='off' />
 				<input type='hidden' name='q' value='/post/list'>
 				<input type='submit' value='Find' style='display: none;' />
 			</form>
-			<div id='search_completions'></div>";
+		";
 
 		return $h_prev.' | '.$h_index.' | '.$h_next.'<br>'.$h_search;
 	}
diff --git a/ext/tag_edit/theme.php b/ext/tag_edit/theme.php
index 4c08d5b3..bdbce1a1 100644
--- a/ext/tag_edit/theme.php
+++ b/ext/tag_edit/theme.php
@@ -20,29 +20,12 @@ class TagEditTheme extends Themelet {
 	}
 
 	public function get_tag_editor_html(Image $image) {
-		$script = "
-			<script type='text/javascript'>
-			$().ready(function() {
-				$('#tag_editor').autocomplete('".make_link("api/internal/tag_list/complete")."', {
-					width: 320,
-					max: 15,
-					highlight: false,
-					multiple: true,
-					multipleSeparator: ' ',
-					scroll: true,
-					scrollHeight: 300,
-					selectFirst: false
-				});
-			});
-			</script>
-		";
 		$h_tags = html_escape($image->get_tag_list());
 		return "
 			<tr>
 				<td width='50px'>Tags</td>
-				<td width='300px'><input type='text' name='tag_edit__tags' value='$h_tags' id='tag_editor'></td>
+				<td width='300px'><input type='text' name='tag_edit__tags' value='$h_tags' class='tag_autocomplete' id='tag_editor'></td>
 			</tr>
-			$script
 		";
 	}
 
diff --git a/lib/shimmie.js b/lib/shimmie.js
index 611d49ee..068d3b66 100644
--- a/lib/shimmie.js
+++ b/lib/shimmie.js
@@ -29,7 +29,7 @@ $(document).ready(function() {
 	$("time").timeago();
 
 	$('.search_input').DefaultValue('Search');
-	$('#search_input').autocomplete(base_href + '/api/internal/tag_list/complete', {
+	$('.tag_autocomplete').autocomplete(base_href + '/api/internal/tag_list/complete', {
 		width: 320,
 		max: 15,
 		highlight: false,