diff --git a/js/src/common/components/ModalManager.js b/js/src/common/components/ModalManager.js
index 35a5fa3b6..60cb3e207 100644
--- a/js/src/common/components/ModalManager.js
+++ b/js/src/common/components/ModalManager.js
@@ -53,7 +53,11 @@ export default class ModalManager extends Component {
 
     m.redraw(true);
 
-    this.$().modal({backdrop: this.component.isDismissible() ? true : 'static'}).modal('show');
+    const dismissible = !!this.component.isDismissible();
+    this.$().modal({
+      backdrop: dismissible || 'static',
+      keyboard: dismissible
+    }).modal('show');
   }
 
   /**