diff --git a/ext/home/theme.php b/ext/home/theme.php
index 16e1a5d3..8cf95d8f 100644
--- a/ext/home/theme.php
+++ b/ext/home/theme.php
@@ -38,7 +38,7 @@ EOD
 		$search_html = "
 			<div class='space' id='search'>
 				<form action='".make_link("post/list")."' method='GET'>
-				<input name='search' size='30' type='text' value='' class='autocomplete_tags' autofocus='autofocus'/>
+				<input name='search' size='30' type='text' value='' class='autocomplete_tags' autofocus='autofocus' autocomplete='off' />
 				<input type='hidden' name='q' value='/post/list'>
 				<input type='submit' value='Search'/>
 				</form>
diff --git a/ext/index/theme.php b/ext/index/theme.php
index 8a472fc0..438bc1f2 100644
--- a/ext/index/theme.php
+++ b/ext/index/theme.php
@@ -63,7 +63,7 @@ and of course start organising your images :-)
 		$h_search_link = make_link();
 		$h_search = "
 			<p><form action='$h_search_link' method='GET'>
-				<input class='autocomplete_tags' name='search' type='text' placeholder='Search' value='$h_search_string' />
+				<input class='autocomplete_tags' name='search' type='search' placeholder='Search' value='$h_search_string' autocomplete='off' />
 				<input type='hidden' name='q' value='/post/list'>
 				<input type='submit' value='Find' style='display: none;' />
 			</form>
diff --git a/ext/tag_edit/theme.php b/ext/tag_edit/theme.php
index daf2c402..b8922052 100644
--- a/ext/tag_edit/theme.php
+++ b/ext/tag_edit/theme.php
@@ -49,7 +49,7 @@ class TagEditTheme extends Themelet {
 				<td>
 		".($user->can("edit_image_tag") ? "
 					<span class='view'>$h_tag_links</span>
-					<input class='edit' type='text' name='tag_edit__tags' value='$h_tags' class='autocomplete_tags' id='tag_editor'>
+					<input class='edit' type='text' name='tag_edit__tags' value='$h_tags' class='autocomplete_tags' id='tag_editor' autocomplete='off'>
 		" : "
 					$h_tag_links
 		")."
diff --git a/ext/upload/theme.php b/ext/upload/theme.php
index 7c9f734b..157a9e0c 100644
--- a/ext/upload/theme.php
+++ b/ext/upload/theme.php
@@ -20,7 +20,7 @@ class UploadTheme extends Themelet {
 			".make_form(make_link("upload"), "POST", $multipart=True, 'file_upload')."
 				<table id='large_upload_form' class='vert'>
 					$upload_list
-					<tr><td width='20'>Tags<td colspan='5'><input name='tags' type='text' placeholder='tagme' class='autocomplete_tags'></td></tr>
+					<tr><td width='20'>Tags<td colspan='5'><input name='tags' type='text' placeholder='tagme' class='autocomplete_tags' autocomplete='off'></td></tr>
 					<tr><td>Source</td><td colspan='5'><input name='source' type='text'></td></tr>
 					<tr><td colspan='6'><input id='uploadbutton' type='submit' value='Post'></td></tr>
 				</table>
@@ -336,7 +336,7 @@ class UploadTheme extends Themelet {
 			<div class='mini_upload'>
 			".make_form(make_link("upload"), "POST", $multipart=True)."
 				$upload_list
-				<input name='tags' type='text' placeholder='tagme' class='autocomplete_tags' required='required'>
+				<input name='tags' type='text' placeholder='tagme' class='autocomplete_tags' required='required' autocomplete='off'>
 				<input type='submit' value='Post'>
 			</form>
 			<small>(Max file size is $max_kb)</small>