diff --git a/themes/bootstrap3/js/lightbox.js b/themes/bootstrap3/js/lightbox.js
index e6a653f7515f13fd71679fb2d563e19790b72ab2..065af6315564af831e93629f32952dd7fd253834 100644
--- a/themes/bootstrap3/js/lightbox.js
+++ b/themes/bootstrap3/js/lightbox.js
@@ -27,7 +27,6 @@ VuFind.register('lightbox', function Lightbox() {
   }
   function _emit(msg, _details) {
     var details = _details || {};
-    // Fallback to document.createEvent() if creating a new CustomEvent fails (e.g. IE 11)
     var event;
     try {
       event = new CustomEvent(msg, {
@@ -36,6 +35,7 @@ VuFind.register('lightbox', function Lightbox() {
         cancelable: true
       });
     } catch (e) {
+      // Fallback to document.createEvent() if creating a new CustomEvent fails (e.g. IE 11)
       event = document.createEvent('CustomEvent');
       event.initCustomEvent(msg, true, true, details);
     }
@@ -284,6 +284,10 @@ VuFind.register('lightbox', function Lightbox() {
     _clickedButton = null;
     var buttonData = { name: 'submit', value: 1 };
     if (submit.length > 0) {
+      if (typeof submit.data('lightbox-close') !== 'undefined') {
+        close();
+        return false;
+      }
       if (typeof submit.data('lightbox-ignore') !== 'undefined') {
         return true;
       }
diff --git a/themes/bootstrap3/templates/confirm/confirm.phtml b/themes/bootstrap3/templates/confirm/confirm.phtml
index 9967bfbd1654ace49b979cf464a40c87188d430f..910fa886991fdd0921ad6a03d8b628b24f87fe6d 100644
--- a/themes/bootstrap3/templates/confirm/confirm.phtml
+++ b/themes/bootstrap3/templates/confirm/confirm.phtml
@@ -5,7 +5,7 @@
   <?=$this->flashmessages();?>
 
   <div id="popupDetails" class="confirmDialog">
-    <form action="<?=$this->escapeHtmlAttr($this->confirm)?>" method="post">
+    <form class="pull-left" action="<?=$this->escapeHtmlAttr($this->confirm)?>" method="post">
       <?php if (isset($this->extras)): ?>
         <?php foreach ($this->extras as $extra => $value): ?>
           <?php if (is_array($value)): ?>
@@ -18,7 +18,10 @@
         <?php endforeach; ?>
       <?php endif;?>
       <input class="btn btn-primary" type="submit" name="confirm" value="<?=$this->transEsc('confirm_dialog_yes') ?>" />
-      <input class="btn btn-default" type="button" name="cancel" value="<?=$this->transEsc('confirm_dialog_no') ?>" onClick="VuFind.lightbox.close()" />
     </form>
+    <form class="pull-left" action="<?=$this->escapeHtmlAttr($this->cancel) ?>" method="post">
+      <input class="btn btn-default" data-lightbox-close type="submit" name="cancel" value="<?=$this->transEsc('confirm_dialog_no') ?>" />
+    </form>
+    <div class="clearfix"></div>
   </div>
 </div>