diff --git a/hugolib/shortcode.go b/hugolib/shortcode.go
index 67204b740..bfbb1efdb 100644
--- a/hugolib/shortcode.go
+++ b/hugolib/shortcode.go
@@ -150,6 +150,9 @@ func GetTemplate(name string, t Template) *template.Template {
 	if x := t.Lookup("shortcodes/" + name + ".html"); x != nil {
 		return x
 	}
+	if x := t.Lookup("theme/shortcodes/" + name + ".html"); x != nil {
+		return x
+	}
 	return t.Lookup("_internal/shortcodes/" + name + ".html")
 }