diff --git a/CTFd/themes/admin/static/js/style.js b/CTFd/themes/admin/static/js/style.js
index 2ca31dcb..f453d301 100644
--- a/CTFd/themes/admin/static/js/style.js
+++ b/CTFd/themes/admin/static/js/style.js
@@ -37,7 +37,10 @@ $(function () {
     });
 
     $("tr a, button").click(function (e) {
-        e.stopPropagation();
+        // TODO: This is a hack to allow modal close buttons to work
+        if (!$(this).attr('data-dismiss')) {
+            e.stopPropagation();
+        }
     });
 
     $('[data-toggle="tooltip"]').tooltip()