diff --git a/module/release/model.php b/module/release/model.php
index 2b089d5860..c9f1c54d75 100644
--- a/module/release/model.php
+++ b/module/release/model.php
@@ -89,7 +89,7 @@ class releaseModel extends model
             $branchName = '';
             if($release->branch != 'normal')
             {
-                foreach(explode(',', $release->branch) as $releaseBranch)
+                foreach(explode(',', trim($release->branch, ',')) as $releaseBranch)
                 {
                     $branchName .= $this->loadModel('branch')->getById($releaseBranch);
                     $branchName .= ',';
diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php
index 0581e46db2..738dc68901 100644
--- a/module/story/view/create.html.php
+++ b/module/story/view/create.html.php
@@ -409,10 +409,12 @@ foreach(explode(',', $config->story->create->requiredFields) as $field)
 <script>
 $(function(){parent.$('body.hide-modal-close').removeClass('hide-modal-close');})
 
-var gap = $('#assignedTo').parent().parent().width();
-$('#planIdBox').css('flex', '0 0 ' + gap + 'px')
-$("#branches0").parent().parent().css('flex', '1 0 160px')
-$("#modules0").parent().parent().css('flex', '1 0 160px')
+setTimeout(() => {
+  gap = $('#assignedTo').parent().parent().width();
+  $('#planIdBox').css('flex', '0 0 ' + gap + 'px')
+  $("#branches0").parent().parent().css('flex', '1 0 160px')
+  $("#modules0").parent().parent().css('flex', '1 0 160px')
+}, 600);
 
 </script>
 <?php include '../../common/view/footer.html.php';?>