diff --git a/module/search/view/buildform.html.php b/module/search/view/buildform.html.php
index 9a1ecc4516..482db3d259 100644
--- a/module/search/view/buildform.html.php
+++ b/module/search/view/buildform.html.php
@@ -284,8 +284,11 @@ function executeQuery(queryID)
 
 $(function()
 {
-    if(!canSaveQuery) $('.btn-save-form').attr('disabled', 'disabled');
-
+    if(!canSaveQuery)
+    {
+        $('.btn-save-form').attr('disabled', 'disabled');
+        $('.btn-save-form').css('pointer-events', 'none');
+    }
     var $searchForm = $('#<?php echo $formId;?>');
     $searchForm.find('select.chosen').chosen().on('chosen:showing_dropdown', function()
     {
diff --git a/module/task/js/batchcreate.js b/module/task/js/batchcreate.js
index b98330264c..cccca95207 100755
--- a/module/task/js/batchcreate.js
+++ b/module/task/js/batchcreate.js
@@ -136,12 +136,14 @@ function setPreview(num)
             storyLink  = storyLink + concat + 'onlybody=yes';
         }
         $('#preview' + num).removeAttr('disabled');
+        $('#preview' + num).modalTrigger({type:'iframe'});
         $('#preview' + num).attr('href', storyLink);
     }
     else
     {
         storyLink  = '#';
         $('#preview' + num).attr('disabled', true);
+        $('#preview' + num).css('pointer-events', 'none');
         $('#preview' + num).attr('href', storyLink);
     }
 }