diff --git a/module/execution/view/taskkanban.html.php b/module/execution/view/taskkanban.html.php
index 2c87281cd1..222751e4da 100644
--- a/module/execution/view/taskkanban.html.php
+++ b/module/execution/view/taskkanban.html.php
@@ -103,7 +103,7 @@
       <button class='btn btn-primary' type='button' data-toggle='dropdown'><i class='icon icon-plus'></i> <?php echo $this->lang->create;?> <span class='caret'></span></button>
       <ul class='dropdown-menu pull-right'>
         <?php $showDivider = false;?>
-        <?php if(isset($lang->execution->menu->story)):?>
+        <?php if(isset($lang->execution->menu->story) and $hasStoryButton):?>
         <?php if($canCreateStory) echo '<li>' . html::a(helper::createLink('story', 'create', "productID=$productID&branch=0&moduleID=0&story=0&execution=$execution->id", '', true), $lang->execution->createStory, '', "class='iframe' data-width='80%'") . '</li>';?>
         <?php if($canBatchCreateStory) echo '<li>' . html::a(helper::createLink('story', 'batchCreate', "productID=$productID&branch=0&moduleID=0&story=0&execution=$execution->id", '', true), $lang->execution->batchCreateStory, '', "class='iframe' data-width='90%'") . '</li>';?>
         <?php if($canLinkStory) echo '<li>' . html::a(helper::createLink('execution', 'linkStory', "execution=$execution->id", '', true), $lang->execution->linkStory, '', "class='iframe' data-width='90%'") . '</li>';?>
diff --git a/module/story/js/common.js b/module/story/js/common.js
index 561ab1bdb0..3edd5daa0e 100644
--- a/module/story/js/common.js
+++ b/module/story/js/common.js
@@ -20,7 +20,7 @@ $(function()
         $('#navbar .nav>li[data-id=story]>a').html($('#navbar .nav li.active [data-id=' + storyType + ']').text() + '<span class="caret"></span>');
     }
 
-    $('#saveButton').on('click', function()
+    $('#saveButton').on('click', function(e)
     {
         $('#saveButton').attr('type', 'submit').attr('disabled', true);
         $('#saveDraftButton').attr('disabled', true);
@@ -28,15 +28,16 @@ $(function()
         var storyStatus = !$('#reviewer').val() || $('#needNotReview').is(':checked') ? 'active' : 'reviewing';
         $('<input />').attr('type', 'hidden').attr('name', 'status').attr('value', storyStatus).appendTo('#dataform');
         $('#dataform').submit();
+        e.preventDefault();
 
         setTimeout(function()
         {
             $('#saveButton').attr('type', 'button').removeAttr('disabled');
             $('#saveDraftButton').removeAttr('disabled');
-        }, 1000);
+        }, 10000);
     });
 
-    $('#saveDraftButton').on('click', function()
+    $('#saveDraftButton').on('click', function(e)
     {
         $('#saveButton').attr('disabled', true);
         $('#saveDraftButton').attr('type', 'submit').attr('disabled', true);
@@ -46,12 +47,13 @@ $(function()
         if(typeof(page) !== 'undefined' && page == 'edit' && $('#status').val() == 'changing') storyStatus = 'changing';
         $('<input />').attr('type', 'hidden').attr('name', 'status').attr('value', storyStatus).appendTo('#dataform');
         $('#dataform').submit();
+        e.preventDefault();
 
         setTimeout(function()
         {
             $('#saveButton').removeAttr('disabled');
             $('#saveDraftButton').attr('type', 'button').removeAttr('disabled');
-        }, 1000);
+        }, 10000);
     });
 })