diff --git a/classes/Boom/Controller/Asset.php b/classes/Boom/Controller/Asset.php
index <HASH>..<HASH> 100644
--- a/classes/Boom/Controller/Asset.php
+++ b/classes/Boom/Controller/Asset.php
@@ -48,7 +48,7 @@ abstract class Boom_Controller_Asset extends Boom_Controller
 
 	public function action_embed()
 	{
-		$this->response->body(HTML::image('asset/view/'.$this->asset->id.'/400'));
+		$this->response->body(HTML::anchor('asset/view/'.$this->asset->id, "Download {$this->asset->title}"));
 	}
 
 	/**
diff --git a/classes/Boom/Controller/Asset/Image.php b/classes/Boom/Controller/Asset/Image.php
index <HASH>..<HASH> 100644
--- a/classes/Boom/Controller/Asset/Image.php
+++ b/classes/Boom/Controller/Asset/Image.php
@@ -108,6 +108,11 @@ class Boom_Controller_Asset_Image extends Controller_Asset
 			->body(file_get_contents($filename));
 	}
 
+	public function action_embed()
+	{
+		$this->response->body(HTML::image('asset/view/'.$this->asset->id.'/400'));
+	}
+
 	/**
 	 * Show a thumbnail of the asset.
 	 * For images a thumbnail is just showing an image with different dimensions.
Fix for embedding non-image assets in text