diff --git a/bootbox.js b/bootbox.js
index e407d68e..2b2dde09 100644
--- a/bootbox.js
+++ b/bootbox.js
@@ -43,7 +43,7 @@
     footer:
       "<div class='modal-footer'></div>",
     closeButton:
-      "<button type='button' class='bootbox-close-button close'>&times;</button>",
+      "<button type='button' class='bootbox-close-button close' data-dismiss='modal' aria-hidden='true'>&times;</button>",
     form:
       "<form class='bootbox-form'></form>",
     inputs: {
diff --git a/tests/alert.test.js b/tests/alert.test.js
index ac7bbcc1..600e7b28 100644
--- a/tests/alert.test.js
+++ b/tests/alert.test.js
@@ -62,6 +62,14 @@ describe("bootbox.alert", function() {
           expect(this.find(".modal-body button").hasClass("close")).to.be.true;
         });
 
+        it("applies the correct data-dismiss attribute to the close button", function() {
+          expect(this.find("button.close").attr("data-dismiss")).to.equal("modal");
+        });
+
+        it("applies the correct aria-hidden attribute to the close button", function() {
+          expect(this.find("button.close").attr("aria-hidden")).to.equal("true");
+        });
+
       });
     });