diff --git a/module/execution/view/story.html.php b/module/execution/view/story.html.php
index c67e6f6d21..4da719b838 100644
--- a/module/execution/view/story.html.php
+++ b/module/execution/view/story.html.php
@@ -335,7 +335,7 @@
             $actionLink = $this->createLink('story', 'batchEdit', "productID=0&executionID=$execution->id");
             echo html::commonButton($lang->edit, "data-form-action='$actionLink' $disabled");
             ?>
-            <button type='button' class='btn dropdown-toggle' data-toggle='dropdown'><span class='caret'></span></button>
+            <button type='button' <?php echo $canBatchToTask ? '' : "disabled='disabled'";?> class='btn dropdown-toggle' data-toggle='dropdown'><span class='caret'></span></button>
             <ul class='dropdown-menu'>
               <?php
               $class = $canBatchToTask ? '' : "class='hidden'";
diff --git a/module/tutorial/js/index.js b/module/tutorial/js/index.js
index 43e450fe1b..3fc344e5d7 100644
--- a/module/tutorial/js/index.js
+++ b/module/tutorial/js/index.js
@@ -168,6 +168,8 @@ $(function()
             container = null;
         }
 
+        if($(ele).hasClass('create-bug-btn') || $(ele).hasClass('create-story-btn')) container = '#mainMenu'; // Fix bug #21092.
+
         $e.closest('body').find('.tooltip-tutorial').tooltip('destroy');
         var offset   = $e.offset();
         var winWidth = $(window).width();