diff --git a/app/assets/javascripts/app/controllers/_application_controller_generic.coffee b/app/assets/javascripts/app/controllers/_application_controller_generic.coffee
index a825b8a8bcff..6ce648472a2c 100644
--- a/app/assets/javascripts/app/controllers/_application_controller_generic.coffee
+++ b/app/assets/javascripts/app/controllers/_application_controller_generic.coffee
@@ -260,11 +260,14 @@ class App.ControllerModalLoading extends App.Controller
 
     @render()
 
-    @el.modal
+    @el.modal(
       keyboard:  false
       show:      true
       backdrop:  'static'
       container: @container
+    ).on(
+      'hidden.bs.modal': @localOnClosed
+    )
 
   render: ->
     @html App.view('generic/modal_loader')(
@@ -283,9 +286,12 @@ class App.ControllerModalLoading extends App.Controller
   showIcon: =>
     @$('.js-loadingIcon').removeClass('hide')
 
+  localOnClosed: =>
+    @el.remove()
+
   hide: (delay) =>
     remove = =>
-      @el.remove()
+      @el.modal('hide')
     if !delay
       remove()
       return