diff --git a/include/staff/header.inc.php b/include/staff/header.inc.php
index 9de588c436e41dbe00139a4849ccadb72a93507d..888ec9fd1f6a6ea5025b892ca194f9eccf82209e 100644
--- a/include/staff/header.inc.php
+++ b/include/staff/header.inc.php
@@ -116,7 +116,7 @@
     <div id="content">
 <?php } elseif ($pjax = $ost->getExtraPjax()) { # endif X_PJAX ?>
     <script type="text/javascript">
-    <?php foreach ($pjax as $s) echo $s.";"; ?>
+    <?php foreach (array_filter($pjax) as $s) echo $s.";"; ?>
     </script>
 <?php } # endif X_PJAX ?>
         <?php if($errors['err']) { ?>
diff --git a/include/staff/ticket-view.inc.php b/include/staff/ticket-view.inc.php
index 621365fc4cd85b0c06cab4128c9f10ea1331affe..d155e040cfb7446f5c546cedc5a3cdee77b58e55 100644
--- a/include/staff/ticket-view.inc.php
+++ b/include/staff/ticket-view.inc.php
@@ -982,7 +982,6 @@ $tcount+= $ticket->getNumNotes();
     </form>
     <div class="clear"></div>
 </div>
-<script type="text/javascript" src="js/ticket.js"></script>
 <script type="text/javascript">
 $(function() {
     $(document).on('click', 'a.change-user', function(e) {
diff --git a/scp/tickets.php b/scp/tickets.php
index 3699015aa3745792b0fa05b79c83df9d446f8c69..c94ad4429c560fcdac2efb3b585290f50beaa495 100644
--- a/scp/tickets.php
+++ b/scp/tickets.php
@@ -621,6 +621,8 @@ if($ticket) {
             .($min*60000).");");
 }
 
+$ost->addExtraHeader('<script type="text/javascript" src="js/ticket.js"></script>');
+
 require_once(STAFFINC_DIR.'header.inc.php');
 require_once(STAFFINC_DIR.$inc);
 require_once(STAFFINC_DIR.'footer.inc.php');