diff --git a/controllers/ViewPhoto.php b/controllers/ViewPhoto.php
index cff5ed6c..e46929db 100644
--- a/controllers/ViewPhoto.php
+++ b/controllers/ViewPhoto.php
@@ -27,10 +27,6 @@ class ViewPhoto extends HTMLController
 			$this->handleConfirmDelete($user, $author, $photo);
 		else
 			$this->handleViewPhoto($user, $author, $photo);
-
-		// Add an edit button to the admin bar.
-		if ($user->isAdmin())
-			$this->admin_bar->appendItem(BASEURL . '/editasset/?id=' . $photo->getId(), 'Edit this photo');
 	}
 
 	private function handleConfirmDelete(User $user, User $author, Asset $photo)
diff --git a/templates/PhotoPage.php b/templates/PhotoPage.php
index 772a4f99..490b2cc6 100644
--- a/templates/PhotoPage.php
+++ b/templates/PhotoPage.php
@@ -250,7 +250,8 @@ class PhotoPage extends Template
 		echo '
 				<div id="user_actions_box" class="content-box">
 					<h3>Actions</h3>
-					<a class="btn btn-danger" href="', BASEURL, '/', $this->photo->getSlug(), '?confirm_delete">Delete</a>
+					<a class="btn btn-primary" href="', BASEURL, '/editasset/?id=', $this->photo->getId(), '?confirm_delete">Edit photo</a>
+					<a class="btn btn-danger" href="', BASEURL, '/', $this->photo->getSlug(), '?confirm_delete">Delete photo</a>
 				</div>';
 	}
 }