diff --git a/app/controllers/admin/events_controller.rb b/app/controllers/admin/events_controller.rb
index 4ba56cfc..42337b59 100644
--- a/app/controllers/admin/events_controller.rb
+++ b/app/controllers/admin/events_controller.rb
@@ -12,6 +12,7 @@ class Admin::EventsController < ApplicationController
     @events = @conference.events
     @tracks = @conference.tracks
     @event_states = @events.state_machine.states.map
+    @event_types = @conference.event_types
     respond_to do |format|
       format.html
       # Explicity call #to_json to avoid the use of EventSerializer
diff --git a/app/views/admin/events/_proposal.html.haml b/app/views/admin/events/_proposal.html.haml
index c1074bfe..f8374eaf 100644
--- a/app/views/admin/events/_proposal.html.haml
+++ b/app/views/admin/events/_proposal.html.haml
@@ -19,7 +19,7 @@
           .dropdown
             = link_to "#", :class => "dropdown-toggle", :id => "type-dropdown" do
               - if @event.event_type.nil?
-                Track
+                Event Type
               - else
                 = @event.event_type.title
               <b class="caret"></b>
diff --git a/app/views/admin/events/index.html.haml b/app/views/admin/events/index.html.haml
index 4040fb6b..eafc6af1 100644
--- a/app/views/admin/events/index.html.haml
+++ b/app/views/admin/events/index.html.haml
@@ -134,7 +134,17 @@
               - l = link_to "Change", edit_admin_conference_event_speaker_path(@conference.short_title, event), :remote => true
               = "(#{l})".html_safe
             %td
-              = event.event_type.title
+              .dropdown
+                = link_to "#", :class => "dropdown-toggle", :id => "type-dropdown" do
+                  - if event.event_type.nil?
+                    Event Type
+                  - else
+                    = event.event_type.title
+                  <b class="caret"></b>
+                %ul.dropdown-menu
+                  - @event_types.each do |type|
+                    %li= link_to type.title, admin_conference_event_path(@conference.short_title, event, :event_type_id => type.id) ,
+                      :method => :put, :event_type_id => type.id
             %td
               .dropdown
                 = link_to "#", :class => "dropdown-toggle", :id => "track-dropdown" do