diff --git a/module/task/js/create.js b/module/task/js/create.js
index d63f2138e6..a0e2460ed1 100644
--- a/module/task/js/create.js
+++ b/module/task/js/create.js
@@ -62,6 +62,18 @@ function loadExecutionStories(executionID)
         $('#story').next('.picker').remove();
         $('#story').replaceWith(data);
         $('#story').addClass('filled').chosen();
+        
+        /* If there is no story option, select will be hidden and text will be displayed; otherwise, the opposite is true */
+        if($('#story option').length > 1)
+        {
+            $('#story').parent().removeClass('hidden');
+            $('#storyBox').addClass('hidden');
+        }
+        else
+        {           
+            $('#storyBox').removeClass('hidden');
+            $('#story').parent().addClass('hidden');
+        }
 
         if($('#testStoryBox table tbody tr').length == 0)
         {
diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php
index 6e3d083976..492f20a3d4 100644
--- a/module/task/view/create.html.php
+++ b/module/task/view/create.html.php
@@ -79,27 +79,25 @@
         <?php if(strpos(",$showFields,", ',story,') !== false and $execution->type != 'ops'):?>
         <tr>
           <th><?php echo $lang->task->story;?></th>
-          <td colspan='3'>
-            <?php if(empty($stories)):?>
-            <span id='storyBox'><?php printf($lang->task->noticeLinkStory, html::a($this->createLink('execution', 'linkStory', "executionID=$execution->id"), $lang->execution->linkStory, '_blank', 'class="text-primary"'), html::a("javascript:loadStories($execution->id)", $lang->refresh, '', 'class="text-primary"'));?></span>
-            <?php else:?>
-            <div class='input-group'>
-              <?php echo html::select('story', array($task->story => $stories[$task->story]), $task->story, "class='form-control chosen' onchange='setStoryRelated();'");?>
+          <td colspan='3'>           
+            <span id='storyBox' class="<?php if(!empty($stories)) echo 'hidden';?> "><?php printf($lang->task->noticeLinkStory, html::a($this->createLink('execution', 'linkStory', "executionID=$execution->id"), $lang->execution->linkStory, '_blank', 'class="text-primary"'), html::a("javascript:loadStories($execution->id)", $lang->refresh, '', 'class="text-primary"'));?></span> 
+            <div class='input-group <?php if(empty($stories)) echo "hidden";?>'>
+              <?php echo html::select('story', array($task->story => empty($stories) ? '': $stories[$task->story]), $task->story, "class='form-control chosen' onchange='setStoryRelated();'");?>
               <span class='input-group-btn' id='preview'><a href='#' class='btn iframe'><?php echo $lang->preview;?></a></span>
             </div>
-            <?php endif;?>
+            
           </td>
         </tr>
         <?php endif;?>
-        <?php if($stories and $execution->type != 'ops'):?>
+        <?php if($execution->type != 'ops'):?>
         <tr id='testStoryBox' class='hidden'>
           <th><?php echo $lang->task->selectTestStory;?></th>
           <td colspan='3'>
             <table class='table table-form mg-0 table-bordered'>
               <thead>
                 <tr>
-                  <th><?php echo $lang->task->storyAB;?></th>
-                  <th class='w-100px'><?php echo $lang->task->pri;?></th>
+                  <th class='w-150px'><?php echo $lang->task->storyAB;?></th>
+                  <th class='w-80px'><?php echo $lang->task->pri;?></th>
                   <th class='w-300px'><?php echo $lang->task->datePlan;?></th>
                   <th class='w-150px'><?php echo $lang->task->assignedTo;?></th>
                   <th class='w-80px'><?php echo $lang->task->estimate;?></th>