diff --git a/src/Umbraco.Core/Services/FileService.cs b/src/Umbraco.Core/Services/FileService.cs
index aa14b1afa0..c3d6c3f2de 100644
--- a/src/Umbraco.Core/Services/FileService.cs
+++ b/src/Umbraco.Core/Services/FileService.cs
@@ -294,10 +294,10 @@ namespace Umbraco.Core.Services
         }
 
         /// <summary>
-        /// Gets a <see cref="ITemplate"/> object by its alias
+        /// Gets a <see cref="ITemplate"/> object by its alias.
         /// </summary>
-        /// <param name="alias">Alias of the template</param>
-        /// <returns>A <see cref="Template"/> object</returns>
+        /// <param name="alias">The alias of the template.</param>
+        /// <returns>The <see cref="ITemplate"/> object matching the alias, or null.</returns>
         public ITemplate GetTemplate(string alias)
         {
             using (var repository = _repositoryFactory.CreateTemplateRepository(_dataUowProvider.GetUnitOfWork()))
@@ -307,10 +307,10 @@ namespace Umbraco.Core.Services
         }
 
         /// <summary>
-        /// Gets a <see cref="ITemplate"/> object by its alias
+        /// Gets a <see cref="ITemplate"/> object by its identifier.
         /// </summary>
-        /// <param name="id">Id of the template</param>
-        /// <returns>A <see cref="ITemplate"/> object</returns>
+        /// <param name="id">The identifer of the template.</param>
+        /// <returns>The <see cref="ITemplate"/> object matching the identifier, or null.</returns>
         public ITemplate GetTemplate(int id)
         {
             using (var repository = _repositoryFactory.CreateTemplateRepository(_dataUowProvider.GetUnitOfWork()))
@@ -319,6 +319,20 @@ namespace Umbraco.Core.Services
             }
         }
 
+        /// <summary>
+        /// Gets a <see cref="ITemplate"/> object by its guid identifier.
+        /// </summary>
+        /// <param name="id">The guid identifier of the template.</param>
+        /// <returns>The <see cref="ITemplate"/> object matching the identifier, or null.</returns>
+        public ITemplate GetTemplate(Guid id)
+        {
+            using (var repository = _repositoryFactory.CreateTemplateRepository(_dataUowProvider.GetUnitOfWork()))
+            {
+                var query = Query<ITemplate>.Builder.Where(x => x.Key == id);
+                return repository.GetByQuery(query).SingleOrDefault();
+            }
+        }
+
         public IEnumerable<ITemplate> GetTemplateDescendants(string alias)
         {
             using (var repository = _repositoryFactory.CreateTemplateRepository(_dataUowProvider.GetUnitOfWork()))
diff --git a/src/Umbraco.Core/Services/IFileService.cs b/src/Umbraco.Core/Services/IFileService.cs
index e56abc71b5..18318de1db 100644
--- a/src/Umbraco.Core/Services/IFileService.cs
+++ b/src/Umbraco.Core/Services/IFileService.cs
@@ -117,19 +117,26 @@ namespace Umbraco.Core.Services
         IEnumerable<ITemplate> GetTemplates(int masterTemplateId);
 
         /// <summary>
-        /// Gets a <see cref="ITemplate"/> object by its alias
+        /// Gets a <see cref="ITemplate"/> object by its alias.
         /// </summary>
-        /// <param name="alias">Alias of the template</param>
-        /// <returns>A <see cref="ITemplate"/> object</returns>
+        /// <param name="alias">The alias of the template.</param>
+        /// <returns>The <see cref="ITemplate"/> object matching the alias, or null.</returns>
         ITemplate GetTemplate(string alias);
 
         /// <summary>
-        /// Gets a <see cref="ITemplate"/> object by its alias
+        /// Gets a <see cref="ITemplate"/> object by its identifier.
         /// </summary>
-        /// <param name="id">Id of the template</param>
-        /// <returns>A <see cref="ITemplate"/> object</returns>
+        /// <param name="id">The identifer of the template.</param>
+        /// <returns>The <see cref="ITemplate"/> object matching the identifier, or null.</returns>
         ITemplate GetTemplate(int id);
 
+        /// <summary>
+        /// Gets a <see cref="ITemplate"/> object by its guid identifier.
+        /// </summary>
+        /// <param name="id">The guid identifier of the template.</param>
+        /// <returns>The <see cref="ITemplate"/> object matching the identifier, or null.</returns>
+        ITemplate GetTemplate(Guid id);
+
         /// <summary>
         /// Gets the template descendants
         /// </summary>