diff --git a/app/assets/javascripts/artists.js b/app/assets/javascripts/artists.js
index b59a8b8d0..fcb000e29 100644
--- a/app/assets/javascripts/artists.js
+++ b/app/assets/javascripts/artists.js
@@ -4,9 +4,22 @@
   Danbooru.Artist.initialize_all = function() {
     if ($("#c-artists").length) {
       Danbooru.Artist.initialize_check_name_link();
+      Danbooru.Artist.initialize_typeahead();
     }
   }
 
+  Danbooru.Artist.initialize_typeahead = function() {
+    $("#quick_search_name").typeahead({
+      name: "artists",
+      remote: "/artists.json?search[name]=*%QUERY*",
+      limit: 10,
+      valueKey: "name",
+      template: function(context) {
+        return "<p>" + context.name.replace(/_/g, " ") + "</a></p>";
+      }
+    });
+  }
+
   Danbooru.Artist.initialize_check_name_link = function() {
     $("#check-name-link").click(function(e) {
       var artist_name = $("#artist_name").val();
diff --git a/app/assets/javascripts/wiki_pages.js b/app/assets/javascripts/wiki_pages.js
new file mode 100644
index 000000000..3494283d4
--- /dev/null
+++ b/app/assets/javascripts/wiki_pages.js
@@ -0,0 +1,21 @@
+(function() {
+  Danbooru.WikiPage = {};
+
+  Danbooru.WikiPage.initialize_all = function() {
+    if ($("#c-wiki-pages").length) {
+      $("#quick_search_title,#wiki_page_title").typeahead({
+        name: "wiki_pages",
+        remote: "/wiki_pages.json?search[title]=*%QUERY*",
+        limit: 10,
+        valueKey: "title",
+        template: function(context) {
+          return "<p>" + context.title.replace(/_/g, " ") + "</a></p>";
+        }
+      });
+    }
+  }
+})();
+
+$(document).ready(function() {
+  Danbooru.WikiPage.initialize_all();
+});