From c4f431d262c1443bdf07a32890967c2b9688db62 Mon Sep 17 00:00:00 2001
From: Heinrich Fenkart <hnrch02@gmail.com>
Date: Tue, 9 Sep 2014 00:10:18 +0200
Subject: [PATCH] Remove `.modal-open` class after backdrop is hidden

Fixes #14274.
Fixes #14632.
---
 js/modal.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/js/modal.js b/js/modal.js
index d0426b01b6..cef013a56f 100644
--- a/js/modal.js
+++ b/js/modal.js
@@ -107,9 +107,6 @@
 
     this.isShown = false
 
-    this.$body.removeClass('modal-open')
-
-    this.resetScrollbar()
     this.escape()
 
     $(document).off('focusin.bs.modal')
@@ -150,6 +147,8 @@
     var that = this
     this.$element.hide()
     this.backdrop(function () {
+      that.$body.removeClass('modal-open')
+      that.resetScrollbar()
       that.$element.trigger('hidden.bs.modal')
     })
   }