diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgridselector.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgridselector.directive.js
index dfd1e1184d..fcc02f53a2 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgridselector.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgridselector.directive.js
@@ -1,7 +1,7 @@
 (function () {
     'use strict';
 
-    function GridSelector($location, overlayService) {
+    function GridSelector($location, overlayService, editorService) {
 
         function link(scope, el, attr, ctrl) {
 
@@ -56,8 +56,16 @@
             };
 
             scope.openTemplate = function (selectedItem) {
-                var url = "/settings/templates/edit/" + selectedItem.id;
-                $location.url(url);
+                const editor = {
+                    id: selectedItem.id,
+                    submit: function () {
+                        editorService.close();
+                    },
+                    close: function () {
+                        editorService.close();
+                    }
+                };
+                editorService.templateEditor(editor);
             }
 
             scope.setAsDefaultItem = function (selectedItem) {