diff --git a/PHPCI/Controller/ProjectController.php b/PHPCI/Controller/ProjectController.php
index bbc8a7b5..eaad90a1 100644
--- a/PHPCI/Controller/ProjectController.php
+++ b/PHPCI/Controller/ProjectController.php
@@ -79,6 +79,7 @@ class ProjectController extends \PHPCI\Controller
         $this->_projectStore->delete($project);
 
         header('Location: '.PHPCI_URL);
+        exit;
     }
 
     /**
diff --git a/PHPCI/View/Build/view.phtml b/PHPCI/View/Build/view.phtml
index b5aa7324..f57a1a45 100644
--- a/PHPCI/View/Build/view.phtml
+++ b/PHPCI/View/Build/view.phtml
@@ -13,7 +13,7 @@
 			<li class="nav-header">Options</li>
 			<li><a href="<?= PHPCI_URL ?>build/rebuild/<?php print $build->getId(); ?>"><i class="icon-cog"></i> Rebuild</a></li>
 			<?php if($this->User()->getIsAdmin()): ?>
-			<li><a href="javascript:confirmDelete('<?= PHPCI_URL ?>build/delete/<?php print $build->getId(); ?>')"><i class="icon-trash"></i> Delete Build</a></li>
+			<li><a href="#" id="delete-build"><i class="icon-trash"></i> Delete Build</a></li>
 			<?php endif; ?>
 		</ul>
 		</div>
@@ -73,8 +73,12 @@
 	}, 10000);
 	<?php endif; ?>
 
-	$(document).ready(function()
-	{
+	$(function() {
 		updateBuildView(window.initial);
+
+        $('#delete-build').on('click', function (e) {
+            e.preventDefault();
+            confirmDelete("<?= PHPCI_URL ?>build/delete/<?php print $build->getId(); ?>");
+        });
 	});
 </script>
\ No newline at end of file
diff --git a/PHPCI/View/Project/view.phtml b/PHPCI/View/Project/view.phtml
index bb8aec03..77d488fc 100644
--- a/PHPCI/View/Project/view.phtml
+++ b/PHPCI/View/Project/view.phtml
@@ -14,7 +14,7 @@
 
 			<?php if($this->User()->getIsAdmin()): ?>
 			<li><a href="<?= PHPCI_URL ?>project/edit/<?php print $project->getId(); ?>"><i class="icon-edit"></i> Edit Project</a></li>
-			<li><a href="javascript:confirmDelete('<?= PHPCI_URL ?>project/delete/<?php print $project->getId(); ?>')"><i class="icon-trash"></i> Delete Project</a></li>
+			<li><a href="#" id="delete-project"><i class="icon-trash"></i> Delete Project</a></li>
 			<?php endif; ?>
 		</ul>
 		</div>
@@ -80,9 +80,16 @@
 
 <?php if($page == 1): ?>
 <script>
-setInterval(function()
-{
-	$('#latest-builds').load('<?= PHPCI_URL ?>project/builds/<?php print $project->getId(); ?>');
-}, 10000);
+    setInterval(function()
+    {
+        $('#latest-builds').load('<?= PHPCI_URL ?>project/builds/<?php print $project->getId(); ?>');
+    }, 10000);
+
+    $(function() {
+        $('#delete-project').on('click', function (e) {
+            e.preventDefault();
+            confirmDelete("<?= PHPCI_URL ?>project/delete/<?php print $project->getId(); ?>");
+        });
+    })
 </script>
 <?php endif; ?>