diff --git a/controllers/EditAsset.php b/controllers/EditAsset.php
index 8fc7bf4e..a6ca7f9b 100644
--- a/controllers/EditAsset.php
+++ b/controllers/EditAsset.php
@@ -94,10 +94,6 @@ class EditAsset extends HTMLController
 		$page = new EditAssetForm($asset, $thumbs);
 		parent::__construct('Edit asset \'' . $asset->getTitle() . '\' (' . $asset->getFilename() . ') - ' . SITE_TITLE);
 		$this->page->adopt($page);
-
-		// Add a view button to the admin bar for photos.
-		if ($asset->isImage())
-			$this->admin_bar->appendItem($asset->getImage()->getPageUrl(), 'View this photo');
 	}
 
 	private function getThumbs(Asset $asset)
diff --git a/controllers/HTMLController.php b/controllers/HTMLController.php
index a5d5236b..f1416381 100644
--- a/controllers/HTMLController.php
+++ b/controllers/HTMLController.php
@@ -12,7 +12,6 @@
 abstract class HTMLController
 {
 	protected $page;
-	protected $admin_bar;
 
 	public function __construct($title)
 	{
diff --git a/templates/PhotoPage.php b/templates/PhotoPage.php
index 932abc03..b2d663ff 100644
--- a/templates/PhotoPage.php
+++ b/templates/PhotoPage.php
@@ -250,7 +250,7 @@ class PhotoPage extends Template
 		echo '
 				<div id="user_actions_box" class="content-box">
 					<h3>Actions</h3>
-					<a class="btn btn-primary" href="', BASEURL, '/editasset/?id=', $this->photo->getId(), '?confirm_delete">Edit photo</a>
+					<a class="btn btn-primary" href="', BASEURL, '/editasset/?id=', $this->photo->getId(), '">Edit photo</a>
 					<a class="btn btn-danger" href="', BASEURL, '/', $this->photo->getSlug(), '?confirm_delete">Delete photo</a>
 				</div>';
 	}