diff --git a/app/views/stories/_form.html.erb b/app/views/stories/_form.html.erb
index f85506c..92569b9 100644
--- a/app/views/stories/_form.html.erb
+++ b/app/views/stories/_form.html.erb
@@ -182,6 +182,15 @@
         Lobsters.fetchURLTitle($(this), $("#story_url"), $("#story_title"));
         return false;
       });
+
+      $("#story_tags_a").select2({
+        formatSelection: function(what) {
+          return what.id;
+        },
+        matcher: function(term, text, opt) {
+          return (text.toLowerCase().indexOf(term.toLowerCase()) >= 0);
+        },
+      });
     });
   </script>
 <% end %>
diff --git a/app/views/stories/new.html.erb b/app/views/stories/new.html.erb
index b59bbc7..61b1246 100644
--- a/app/views/stories/new.html.erb
+++ b/app/views/stories/new.html.erb
@@ -39,13 +39,7 @@
 
 <script>
   $(document).ready(function() {
-    <% if @story.previewing %>
-      $("#story_tags_a").select2({
-        formatSelection: function(what) {
-          return what.id;
-        }
-      });
-    <% else %>
+    <% if !@story.previewing %>
       $("#story_url").focus();
     <% end %>
   });