diff --git a/app/assets/javascripts/posts.js b/app/assets/javascripts/posts.js
index ec0d11d97..636a8c3dc 100644
--- a/app/assets/javascripts/posts.js
+++ b/app/assets/javascripts/posts.js
@@ -95,7 +95,7 @@
     if ($("#a-show").length) {
       $(document).bind("keydown.e", function(e) {
         $("#post-edit-link").trigger("click");
-        $("#post_tag_string").trigger("focus");
+        $("#post_tag_string").focus();
         e.preventDefault();
       });
 
@@ -238,6 +238,8 @@
         $("#edit").show();
         $("#comments").hide();
         $("#share").hide();
+        $("#post_tag_string").focus();
+        $("")
       } else {
         $("#edit").hide();
         $("#comments").hide();
diff --git a/app/controllers/legacy_controller.rb b/app/controllers/legacy_controller.rb
index 2a5e02e3f..799c2300f 100644
--- a/app/controllers/legacy_controller.rb
+++ b/app/controllers/legacy_controller.rb
@@ -25,7 +25,7 @@ class LegacyController < ApplicationController
   end
   
   def tags
-    @tags = Tag.limit(100).search(params).paginate(params[:page])
+    @tags = Tag.limit(100).search(params).paginate(params[:page], :limit => params[:limit])
   end
   
   def artists
diff --git a/lib/danbooru/paginator/active_record_extension.rb b/lib/danbooru/paginator/active_record_extension.rb
index 991c8def5..dd00bbca0 100644
--- a/lib/danbooru/paginator/active_record_extension.rb
+++ b/lib/danbooru/paginator/active_record_extension.rb
@@ -81,7 +81,11 @@ module Danbooru
         def option_for(key)
           case key
           when :limit
-            @paginator_options.try(:[], :limit) || Danbooru.config.posts_per_page
+            limit = @paginator_options.try(:[], :limit) || Danbooru.config.posts_per_page
+            if limit.to_i > 1_000
+              limit = 1000
+            end
+            limit
             
           when :count
             if @paginator_options.has_key?(:search_count) && @paginator_options[:search_count].blank?