diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb
index ac57a304d..248090eb6 100644
--- a/app/controllers/events_controller.rb
+++ b/app/controllers/events_controller.rb
@@ -8,6 +8,9 @@ class EventsController < ApplicationController
   def index
     @start_date = date_or_default_for(:start)
     @end_date = date_or_default_for(:end)
+    @tag_search = params[:tag_search]
+
+    # TODO: Include tag_search in this query:
 
     query = Event.non_duplicates.ordered_by_ui_field(params[:order]).includes(:venue, :tags)
     @events = params[:date] ?
diff --git a/themes/activate/views/events/index.html.erb b/themes/activate/views/events/index.html.erb
index f284e9ef6..10f36221b 100644
--- a/themes/activate/views/events/index.html.erb
+++ b/themes/activate/views/events/index.html.erb
@@ -22,12 +22,19 @@
         <label for='date_end'>To</label>
         <%= text_field_tag 'date[end]', @end_date.strftime('%Y-%m-%d'), :id => 'date_end', :class => 'date_picker' %>
       </div>
-      <div>
-        <label for="commit">&nbsp;</label>
-        <%= submit_tag 'Filter' %>
-        <span class="clear_filter"><%= link_to 'Reset', events_url %></span>
-      </div>
-    </div>
+  	</div>
+     <div id='tag_search_box'>
+       <label for='tag_search' style='text-align:left; padding-left:20px; padding-right:10px; width:auto;'>Tag</label>
+	<% @tags = ActsAsTaggableOn::Tag.all %>
+	<% options = "<option>Select a tag</option>" + options_for_select(@tags) %>
+	<%= select_tag(:tag_search, options.html_safe, :style => "width:114px;") %>
+     </div>
+	<br/>
+     <div>
+       <label for="commit">&nbsp;</label>
+       <%= submit_tag 'Filter' %>
+       <span class="clear_filter"><%= link_to 'Reset', events_url %></span>
+     </div>
     <% end %>
     
     <h3>Subscribe to</h3>