diff --git a/ext/index/main.php b/ext/index/main.php
index bcd68240..3c7f8c6b 100644
--- a/ext/index/main.php
+++ b/ext/index/main.php
@@ -173,6 +173,28 @@ class Index extends SimpleExtension {
 				$this->theme->display_page($page, $images);
 			}
 		}
+
+		if($event->page_matches("api/internal/index/get_tags")) {
+			$page->set_mode("data");
+			$page->set_type("text/plain");
+
+			$term = ltrim($_GET["term"]);
+			$space_pos = strrpos($term, " ");
+			$pre = "";
+			$term_only = $term;
+			if($space_pos !== FALSE) {
+				$pre = substr($term, 0, $space_pos+1);
+				$term_only = substr($term, $space_pos+1);
+			}
+
+			$all = $database->get_all(
+				"SELECT tag FROM tags WHERE tag LIKE ? LIMIT 10",
+				array($term_only."%"));
+
+			$res = array();
+			foreach($all as $row) {$res[] = $pre.$row["tag"];}
+			$page->set_data(json_encode($res));
+		}
 	}
 
 	public function onSetupBuilding($event) {
diff --git a/ext/index/theme.php b/ext/index/theme.php
index e2efd36d..6651fa5c 100644
--- a/ext/index/theme.php
+++ b/ext/index/theme.php
@@ -82,6 +82,10 @@ EOD;
 			<script><!--
 			$(document).ready(function() {
 				$(\"#search_input\").DefaultValue(\"Search\");
+				$(\"#search_input\").autocomplete({
+				    source: \"".make_link("api/internal/index/get_tags")."\",
+					minLength: 2
+					});
 			});
 			//--></script>
 			<p><form action='$h_search_link' method='GET'>