diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index 1663fb497..50a9b1c6b 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -2721,6 +2721,16 @@ class Context
 	{
 		self::$_instance->canonical_url = escape($url, false);
 	}
+	
+	/**
+	 * Get canonical URL
+	 * 
+	 * @return string
+	 */
+	public static function getCanonicalURL()
+	{
+		return self::$_instance->canonical_url;
+	}
 }
 /* End of file Context.class.php */
 /* Location: ./classes/context/Context.class.php */
diff --git a/common/tpl/common_layout.html b/common/tpl/common_layout.html
index 6d4ed4454..15a38c76f 100644
--- a/common/tpl/common_layout.html
+++ b/common/tpl/common_layout.html
@@ -36,7 +36,7 @@
 <link rel="alternate" type="application/atom+xml" title="Site Atom" href="{$general_atom_url}" cond="$general_rss_url" />
 
 <!-- ICONS AND OTHER LINKS -->
-<link cond="$canonical_url" rel="canonical" href="{$canonical_url}" />
+<link cond="Context::getCanonicalURL()" rel="canonical" href="{Context::getCanonicalURL()}" />
 <link cond="$favicon_url" rel="shortcut icon" href="{$favicon_url}" />
 <link cond="$mobicon_url" rel="apple-touch-icon" href="{$mobicon_url}" />