diff --git a/e107_core/shortcodes/single/search.sc b/e107_core/shortcodes/single/search.sc
index 0675eb171..17c245611 100644
--- a/e107_core/shortcodes/single/search.sc
+++ b/e107_core/shortcodes/single/search.sc
@@ -5,7 +5,11 @@ e107::includeLan(e_PLUGIN."search_menu/languages/".e_LANGUAGE.".php");
 $text = "";
 if (!isset($SEARCH_SHORTCODE)) 
 {
-	if (file_exists(THEME."search_template.php")) 
+    if (file_exists(THEME."templates/search_template.php"))
+ 	{
+		include(THEME."templates/search_template.php");
+ 	}
+	elseif (file_exists(THEME."search_template.php"))
 	{
 			include(THEME."search_template.php");
 	}