diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
index 31384a2c..a22c9d1f 100644
--- a/app/helpers/events_helper.rb
+++ b/app/helpers/events_helper.rb
@@ -73,6 +73,21 @@ module EventsHelper
     active_dropdown(selection, options)
   end
 
+  def booth_type_dropdown(booth, booth_types, conference_id)
+    selection = booth.booth_type.try(:title) || 'Booth Type'
+    options = booth_types.collect do |booth_type|
+      [
+        booth_type.title,
+        admin_conference_booth_path(
+          conference_id,
+          booth,
+          booth: { booth_type_id: booth_type.id }
+        )
+      ]
+    end
+    active_dropdown(selection, options)
+  end
+
   def track_dropdown(event, tracks, conference_id)
     selection = event.track.try(:name) || 'Track'
     options = tracks.collect do |track|
diff --git a/app/models/admin_ability.rb b/app/models/admin_ability.rb
index 19d6c4d3..a8f74ebc 100644
--- a/app/models/admin_ability.rb
+++ b/app/models/admin_ability.rb
@@ -102,6 +102,7 @@ class AdminAbility
     signed_in_with_organizer_role(user, conf_ids_for_organization_admin)
   end
 
+  # rubocop:disable Metrics/AbcSize
   def signed_in_with_organizer_role(user, conf_ids_for_organization_admin = [])
     # ids of all the conferences for which the user has the 'organizer' role and
     # conferences that belong to organizations for which user is 'organization_admin'
@@ -131,6 +132,7 @@ class AdminAbility
     can :manage, Cfp, program: { conference_id: conf_ids }
     can :manage, Event, program: { conference_id: conf_ids }
     can :manage, EventType, program: { conference_id: conf_ids }
+    can :manage, BoothType, program: { conference_id: conf_ids }
     can :manage, Track, program: { conference_id: conf_ids }
     can :manage, DifficultyLevel, program: { conference_id: conf_ids }
     can :manage, Commercial, commercialable_type: 'Event',
@@ -163,6 +165,7 @@ class AdminAbility
     can [:index, :revert_object, :revert_attribute], PaperTrail::Version, item_type: 'User'
     can [:index, :revert_object, :revert_attribute], PaperTrail::Version, conference_id: conf_ids
   end
+  # rubocop:enable Metrics/AbcSize
 
   def signed_in_with_cfp_role(user)
     # ids of all the conferences for which the user has the 'cfp' role
@@ -175,6 +178,7 @@ class AdminAbility
     can :manage, Booth, conference_id: conf_ids_for_cfp
     can :manage, Event, program: { conference_id: conf_ids_for_cfp }
     can :manage, EventType, program: { conference_id: conf_ids_for_cfp }
+    can :manage, BoothType, program: { conference_id: conf_ids_for_cfp }
     can :manage, Track, program: { conference_id: conf_ids_for_cfp }
     can :manage, DifficultyLevel, program: { conference_id: conf_ids_for_cfp }
     can :manage, EmailSettings, conference_id: conf_ids_for_cfp
@@ -201,7 +205,7 @@ class AdminAbility
     end
 
     can [:index, :revert_object, :revert_attribute], PaperTrail::Version,
-        item_type: %w[Event EventType Track DifficultyLevel EmailSettings Room Cfp Program Comment], conference_id: conf_ids_for_cfp
+        item_type: %w[Event EventType BoothType Track DifficultyLevel EmailSettings Room Cfp Program Comment], conference_id: conf_ids_for_cfp
     can [:index, :revert_object, :revert_attribute], PaperTrail::Version,
         ["item_type = 'Commercial' AND conference_id IN (?) AND (object LIKE '%Event%' OR object_changes LIKE '%Event%')", conf_ids_for_cfp] do |version|
       version.item_type == 'Commercial' && conf_ids_for_cfp.include?(version.conference_id) &&