diff --git a/ext/view/main.php b/ext/view/main.php
index 2f7b7837..7fe0c2a6 100644
--- a/ext/view/main.php
+++ b/ext/view/main.php
@@ -144,6 +144,7 @@ class ViewImage extends Extension {
 		$iibbe = new ImageInfoBoxBuildingEvent($event->get_image(), $user);
 		send_event($iibbe);
 		ksort($iibbe->parts);
+		$this->theme->display_meta_headers($event->get_image());
 		$this->theme->display_page($event->get_image(), $iibbe->parts);
 	}
 }
diff --git a/ext/view/theme.php b/ext/view/theme.php
index e34ec5f5..009defc9 100644
--- a/ext/view/theme.php
+++ b/ext/view/theme.php
@@ -1,20 +1,24 @@
 <?php
 
 class ViewImageTheme extends Themelet {
+	public function display_meta_headers(Image $image) {
+		global $page;
+
+		$h_metatags = str_replace(" ", ", ", html_escape($image->get_tag_list()));
+		$page->add_html_header("<meta name=\"keywords\" content=\"$h_metatags\">");
+		$page->add_html_header("<meta property=\"og:title\" content=\"$h_metatags\">");
+		$page->add_html_header("<meta property=\"og:type\" content=\"article\">");
+		$page->add_html_header("<meta property=\"og:image\" content=\"".make_http($image->get_thumb_link())."\">");
+		$page->add_html_header("<meta property=\"og:url\" content=\"".make_http(make_link("post/view/{$image->id}"))."\">");
+	}
+
 	/*
 	 * Build a page showing $image and some info about it
 	 */
 	public function display_page(Image $image, $editor_parts) {
 		global $page;
 
-		$h_metatags = str_replace(" ", ", ", html_escape($image->get_tag_list()));
-
 		$page->set_title("Image {$image->id}: ".html_escape($image->get_tag_list()));
-		$page->add_html_header("<meta name=\"keywords\" content=\"$h_metatags\">");
-		$page->add_html_header("<meta property=\"og:title\" content=\"$h_metatags\">");
-		$page->add_html_header("<meta property=\"og:type\" content=\"article\">");
-		$page->add_html_header("<meta property=\"og:image\" content=\"".make_http($image->get_thumb_link())."\">");
-		$page->add_html_header("<meta property=\"og:url\" content=\"".make_http(make_link("post/view/{$image->id}"))."\">");
 		$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", 20));
diff --git a/themes/lite/view.theme.php b/themes/lite/view.theme.php
index b1083d0b..f0b5156e 100644
--- a/themes/lite/view.theme.php
+++ b/themes/lite/view.theme.php
@@ -3,14 +3,8 @@
 class CustomViewImageTheme extends ViewImageTheme {
 	public function display_page(Image $image, $editor_parts) {
 		global $page;
-		$metatags = str_replace(" ", ", ", html_escape($image->get_tag_list()));
 		$page->set_title("Image {$image->id}: ".html_escape($image->get_tag_list()));
 		$page->set_heading(html_escape($image->get_tag_list()));
-		$page->add_html_header("<meta name=\"keywords\" content=\"$metatags\">");
-		$page->add_html_header("<meta property=\"og:title\" content=\"$metatags\">");
-		$page->add_html_header("<meta property=\"og:type\" content=\"article\">");
-		$page->add_html_header("<meta property=\"og:image\" content=\"".make_http($image->get_thumb_link())."\">");
-		$page->add_html_header("<meta property=\"og:url\" content=\"".make_http(make_link("post/view/{$image->id}"))."\">");
 		$page->add_block(new Block("Navigation", $this->build_navigation($image), "left", 0));
 		$page->add_block(new Block("Statistics", $this->build_stats($image), "left", 15));
 		$page->add_block(new Block(null, $this->build_info($image, $editor_parts), "main", 11));
diff --git a/themes/material/view.theme.php b/themes/material/view.theme.php
index 8b243e6a..2c740256 100644
--- a/themes/material/view.theme.php
+++ b/themes/material/view.theme.php
@@ -1,22 +1,12 @@
 <?php
 
 class CustomViewImageTheme extends ViewImageTheme {
-
-
 	/*
 	 * Build a page showing $image and some info about it
 	 */
 	public function display_page(Image $image, $editor_parts) {
 		global $page;
-
-		$h_metatags = str_replace(" ", ", ", html_escape($image->get_tag_list()));
-
 		$page->set_title("Image {$image->id}: ".html_escape($image->get_tag_list()));
-		$page->add_html_header("<meta name=\"keywords\" content=\"$h_metatags\">");
-		$page->add_html_header("<meta property=\"og:title\" content=\"$h_metatags\">");
-		$page->add_html_header("<meta property=\"og:type\" content=\"article\">");
-		$page->add_html_header("<meta property=\"og:image\" content=\"".make_http($image->get_thumb_link())."\">");
-		$page->add_html_header("<meta property=\"og:url\" content=\"".make_http(make_link("post/view/{$image->id}"))."\">");
 		$page->set_heading(html_escape($image->get_tag_list()));
 		$page->add_block(new Block(null, $this->build_pin($image), "subtoolbar", 0));
 		$page->add_block(new Block(null, $this->build_info($image, $editor_parts), "left", 20));