diff --git a/src/sunstone/public/js/plugins/oneflow-templates.js b/src/sunstone/public/js/plugins/oneflow-templates.js
index 826f2b206d..3e3f81222e 100644
--- a/src/sunstone/public/js/plugins/oneflow-templates.js
+++ b/src/sunstone/public/js/plugins/oneflow-templates.js
@@ -1042,8 +1042,8 @@ function setupCreateServiceTemplateDialog(){
     $( "#roles_tabs i.remove-tab" ).live( "click", function() {
         var target = $(this).parent().attr("href");
         var dd = $(this).closest('dd');
-        var dl = $(this).closest('.tabs-content');
-        var content = $(target + 'Tab');
+        var dl = $(this).closest('dl');
+        var content = $(target);
 
         dd.remove();
         content.remove();