diff --git a/app/scripts/modules/core/src/pipeline/config/actions/pipelineConfigActions.html b/app/scripts/modules/core/src/pipeline/config/actions/pipelineConfigActions.html
index 9cb364ffbe2..f1b771de1a0 100644
--- a/app/scripts/modules/core/src/pipeline/config/actions/pipelineConfigActions.html
+++ b/app/scripts/modules/core/src/pipeline/config/actions/pipelineConfigActions.html
@@ -12,6 +12,8 @@
 
     <li ng-if="pipeline.locked"><a href ng-click="pipelineConfigurerCtrl.editPipelineJson()">Show JSON</a></li>
     <li ng-if="!pipeline.locked"><a href ng-click="pipelineConfigurerCtrl.editPipelineJson()">Edit as JSON</a></li>
+    <li ng-if="pipeline.locked && isTemplatedPipeline"><a href ng-click="pipelineConfigurerCtrl.editPipelineJson(true)">Show configuration JSON</a></li>
+    <li ng-if="!pipeline.locked && isTemplatedPipeline"><a href ng-click="pipelineConfigurerCtrl.editPipelineJson(true)">Edit configuration as JSON</a></li>
     <li ng-if="viewState.loadingHistory"><a class="disabled"><em>Loading History...</em></a></li>
     <li ng-if="!viewState.loadingHistory && viewState.hasHistory"><a href ng-click="pipelineConfigurerCtrl.showHistory()">Show Revision History</a></li>
     <li ng-if="!viewState.loadingHistory && !viewState.hasHistory"><a class="disabled">No version history found</a></li>
diff --git a/app/scripts/modules/core/src/pipeline/config/pipelineConfigurer.js b/app/scripts/modules/core/src/pipeline/config/pipelineConfigurer.js
index a25f9a84963..89cf9861293 100644
--- a/app/scripts/modules/core/src/pipeline/config/pipelineConfigurer.js
+++ b/app/scripts/modules/core/src/pipeline/config/pipelineConfigurer.js
@@ -166,14 +166,14 @@ module.exports = angular.module('spinnaker.core.pipeline.config.pipelineConfigur
         }).catch(() => {});
     };
 
-    this.editPipelineJson = () => {
+    this.editPipelineJson = (editPipelineConfiguration = false) => {
       $uibModal.open({
         templateUrl: require('./actions/json/editPipelineJsonModal.html'),
         controller: EditPipelineJsonModalCtrl,
         controllerAs: '$ctrl',
         size: 'lg modal-fullscreen',
         resolve: {
-          pipeline: () => $scope.renderablePipeline,
+          pipeline: () => editPipelineConfiguration ? $scope.pipeline : $scope.renderablePipeline,
         }
       }).result.then(() => {
         $scope.$broadcast('pipeline-json-edited');
diff --git a/app/scripts/modules/core/src/pipeline/config/templates/configurePipelineTemplateModal.controller.ts b/app/scripts/modules/core/src/pipeline/config/templates/configurePipelineTemplateModal.controller.ts
index 9291488230e..07bbe57a111 100644
--- a/app/scripts/modules/core/src/pipeline/config/templates/configurePipelineTemplateModal.controller.ts
+++ b/app/scripts/modules/core/src/pipeline/config/templates/configurePipelineTemplateModal.controller.ts
@@ -109,7 +109,7 @@ export class ConfigurePipelineTemplateModalController implements IController {
   }
 
   private loadTemplate(): IPromise<void> {
-    return ReactInjector.pipelineTemplateService.getPipelineTemplateFromSourceUrl(this.source)
+    return ReactInjector.pipelineTemplateService.getPipelineTemplateFromSourceUrl(this.source, this.pipelineId)
       .then(template => { this.template = template });
   }
 
diff --git a/app/scripts/modules/core/src/pipeline/config/templates/pipelineTemplate.service.ts b/app/scripts/modules/core/src/pipeline/config/templates/pipelineTemplate.service.ts
index bfa2786e2ea..2de885a5974 100644
--- a/app/scripts/modules/core/src/pipeline/config/templates/pipelineTemplate.service.ts
+++ b/app/scripts/modules/core/src/pipeline/config/templates/pipelineTemplate.service.ts
@@ -79,8 +79,8 @@ export class PipelineTemplateService {
     'ngInject';
   }
 
-  public getPipelineTemplateFromSourceUrl(source: string): IPromise<IPipelineTemplate> {
-    return this.API.one('pipelineTemplates').one('resolve').withParams({ source }).get()
+  public getPipelineTemplateFromSourceUrl(source: string, pipelineConfigId: String = null): IPromise<IPipelineTemplate> {
+    return this.API.one('pipelineTemplates').one('resolve').withParams({ source: source, pipelineConfigId: pipelineConfigId }).get()
       .then((template: IPipelineTemplate) => {
         template.selfLink = source;
         return template;