diff --git a/app/assets/javascripts/app/lib/app_post/searchable_select.coffee b/app/assets/javascripts/app/lib/app_post/searchable_select.coffee
index 810928954..50b2a2cb8 100644
--- a/app/assets/javascripts/app/lib/app_post/searchable_select.coffee
+++ b/app/assets/javascripts/app/lib/app_post/searchable_select.coffee
@@ -140,11 +140,13 @@ class App.SearchableSelect extends Spine.Controller
       when 39 then @autocompleteOrNavigateIn event # right
       when 37 then @autocompleteOrNavigateOut event # left
       when 13 then @onEnter event
-      when 27 then @onEscape()
+      when 27 then @onEscape event
       when 9 then @onTab event
 
   onEscape: ->
-    @toggle() if @isOpen
+    if @isOpen
+      event.stopPropagation()  # if the input is in a modal, prevent the modal from closing
+      @toggle()
 
   getCurrentOptions: ->
     @currentMenu.find('.js-option, .js-enter, .js-back')