diff --git a/ext/view/theme.php b/ext/view/theme.php
index af9fb5cb..43c4a1b6 100644
--- a/ext/view/theme.php
+++ b/ext/view/theme.php
@@ -5,8 +5,10 @@ class ViewImageTheme extends Themelet {
 	 * Build a page showing $image and some info about it
 	 */
 	public function display_page(Page $page, Image $image, $editor_parts) {
+		$metatags = str_replace(" ", ", ", html_escape($image->get_tag_list()));
+
 		$page->set_title("Image {$image->id}: ".html_escape($image->get_tag_list()));
-		$page->add_header("<meta name=\"keywords\" content=\"".html_escape($image->get_tag_list())."\">");
+		$page->add_header("<meta name=\"keywords\" content=\"$metatags\">");
 		$page->set_heading(html_escape($image->get_tag_list()));
 		$page->add_block(new Block("Navigation", $this->build_navigation($image), "left", 0));
 		$page->add_block(new Block(null, $this->build_info($image, $editor_parts), "main", 10));