diff --git a/module/bug/view/batchcreate.html.php b/module/bug/view/batchcreate.html.php
index 0f6a8bc7a6..7c3e8c87f7 100644
--- a/module/bug/view/batchcreate.html.php
+++ b/module/bug/view/batchcreate.html.php
@@ -21,6 +21,10 @@
       <button type='button' data-toggle='modal' data-target="#importLinesModal" class="btn btn-primary"><?php echo $lang->pasteText;?></button>
       <?php $customLink = $this->createLink('custom', 'ajaxSaveCustomFields', 'module=bug&section=custom&key=batchCreateFields')?>
       <?php include '../../common/view/customfield.html.php';?>
+      <?php if(isonlybody()):?>
+      <div class="divider"></div>
+      <button id="closeModal" type="button" class="btn btn-link" data-dismiss="modal"><i class="icon icon-close"></i></button>
+      <?php endif;?>
     </div>
   </div>
 
@@ -224,12 +228,10 @@
 .body-modal .main-header {padding-right: 0px;}
 .btn-toolbar > .dropdown {margin: 0px;}
 </style>
-<?php $html = '<div class="divider"></div><button id="closeModal" type="button" class="btn btn-link" data-dismiss="modal"><i class="icon icon-close"></i></button>';?>
 <script>
 $(function()
 {
     parent.$('#triggerModal .modal-content .modal-header .close').hide();
-    $('#mainContent .main-header .pull-right.btn-toolbar').append(<?php echo json_encode($html)?>);
     $('#closeModal').on('click', function(){window.parent.$.closeModal();})
 })
 </script>
diff --git a/module/story/view/batchcreate.html.php b/module/story/view/batchcreate.html.php
index 9be8c80774..8a89e14a39 100644
--- a/module/story/view/batchcreate.html.php
+++ b/module/story/view/batchcreate.html.php
@@ -19,6 +19,10 @@
       <button type='button' data-toggle='modal' data-target="#importLinesModal" class="btn btn-primary"><?php echo $lang->pasteText;?></button>
       <?php $customLink = $this->createLink('custom', 'ajaxSaveCustomFields', 'module=story&section=custom&key=batchCreateFields')?>
       <?php include '../../common/view/customfield.html.php';?>
+      <?php if(isonlybody()):?>
+      <div class="divider"></div>
+      <button id="closeModal" type="button" class="btn btn-link" data-dismiss="modal"><i class="icon icon-close"></i></button>
+      <?php endif;?>
     </div>
   </div>
   <?php
@@ -177,12 +181,10 @@ $(function()
 .body-modal .main-header {padding-right: 0px;}
 .btn-toolbar > .dropdown {margin: 0px;}
 </style>
-<?php $html = '<div class="divider"></div><button id="closeModal" type="button" class="btn btn-link" data-dismiss="modal"><i class="icon icon-close"></i></button>';?>
 <script>
 $(function()
 {
     parent.$('#triggerModal .modal-content .modal-header .close').hide();
-    $('#mainContent .main-header .pull-right.btn-toolbar').append(<?php echo json_encode($html)?>);
     $('#closeModal').on('click', function(){window.parent.$.closeModal();})
 })
 </script>
diff --git a/module/task/view/batchcreate.html.php b/module/task/view/batchcreate.html.php
index 857db49589..d04d94a0ac 100644
--- a/module/task/view/batchcreate.html.php
+++ b/module/task/view/batchcreate.html.php
@@ -33,7 +33,10 @@
       <button type='button' data-toggle='modal' data-target="#importLinesModal" class="btn btn-primary"><?php echo $lang->pasteText;?></button>
       <?php $customLink = $this->createLink('custom', 'ajaxSaveCustomFields', 'module=task&section=custom&key=batchCreateFields')?>
       <?php include '../../common/view/customfield.html.php';?>
+      <?php if(isonlybody()):?>
       <div class="divider"></div>
+      <button id="closeModal" type="button" class="btn btn-link" data-dismiss="modal"><i class="icon icon-close"></i></button>
+      <?php endif;?>
     </div>
   </div>
   <?php
@@ -235,15 +238,11 @@
 <?php js::set('storyID', $storyID);?>
 <?php if(isonlybody()):?>
 <style>
-.body-modal .main-header{padding-right:0px;}
-.btn-toolbar>.dropdown{margin:0px;}
+.body-modal .main-header {padding-right: 0px;}
+.btn-toolbar > .dropdown {margin: 0px;}
 </style>
-<?php $html = '<div class="divider"></div><button id="closeModal" type="button" class="btn btn-link" data-dismiss="modal"><i class="icon icon-close"></i></button>';?><script>
-$(function()
-{
-    parent.$('#triggerModal .modal-content .modal-header .close').hide();
-    $('#mainContent .main-header .pull-right.btn-toolbar').append(<?php echo json_encode($html)?>);
-})
+<script>
+$(function(){parent.$('#triggerModal .modal-content .modal-header .close').hide();});
 </script>
 <?php endif;?>
 <?php include '../../common/view/pastetext.html.php';?>