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 1044d2fe1c3..9cb364ffbe2 100644
--- a/app/scripts/modules/core/src/pipeline/config/actions/pipelineConfigActions.html
+++ b/app/scripts/modules/core/src/pipeline/config/actions/pipelineConfigActions.html
@@ -12,8 +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="viewState.hasHistory"><a href ng-click="pipelineConfigurerCtrl.showHistory()">Show Revision History</a></li>
-    <li ng-if="!viewState.hasHistory"><a class="disabled">No version history found</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>
   </ul>
 </div>
diff --git a/app/scripts/modules/core/src/pipeline/config/pipelineConfigurer.js b/app/scripts/modules/core/src/pipeline/config/pipelineConfigurer.js
index 552abca1822..309f2576335 100644
--- a/app/scripts/modules/core/src/pipeline/config/pipelineConfigurer.js
+++ b/app/scripts/modules/core/src/pipeline/config/pipelineConfigurer.js
@@ -44,9 +44,9 @@ module.exports = angular.module('spinnaker.core.pipeline.config.pipelineConfigur
     pipelineConfigService.getHistory($scope.pipeline.id, 2).then(history => {
       if (history && history.length > 1) {
         $scope.viewState.hasHistory = true;
-        this.setViewState({ hasHistory: true });
+        this.setViewState({ hasHistory: true, loadingHistory: false });
       }
-    });
+    }).finally(() => this.setViewState({loadingHistory: false}));
 
     var configViewStateCache = viewStateCache.get('pipelineConfig');
 
@@ -60,6 +60,8 @@ module.exports = angular.module('spinnaker.core.pipeline.config.pipelineConfigur
       loading: false,
     };
 
+    $scope.viewState.loadingHistory = true;
+
     let setOriginal = (pipeline) => {
       $scope.viewState.original = angular.toJson(pipeline);
       $scope.viewState.originalRenderablePipeline = angular.toJson($scope.renderablePipeline);