diff --git a/static/js/controllers.js b/static/js/controllers.js
index c0564a122..c0424d444 100644
--- a/static/js/controllers.js
+++ b/static/js/controllers.js
@@ -622,6 +622,7 @@ function RepoAdminCtrl($scope, Restangular, ApiService, $routeParams, $rootScope
 
   $scope.permissions = {'team': [], 'user': []};
   $scope.logsShown = 0;
+  $scope.deleting = false;
   
   $scope.loadLogs = function() {
     $scope.logsShown++;
@@ -777,6 +778,7 @@ function RepoAdminCtrl($scope, Restangular, ApiService, $routeParams, $rootScope
       'repository': namespace + '/' + name
     };
 
+    $scope.deleting = true;
     ApiService.deleteRepository(null, params).then(function() {
       $scope.repo = null;
       
@@ -784,6 +786,7 @@ function RepoAdminCtrl($scope, Restangular, ApiService, $routeParams, $rootScope
         document.location = '/repository/';
       }, 1000);
     }, function() {
+      $scope.deleting = true;
       $('#cannotchangeModal').modal({});
     });
   };
@@ -1479,6 +1482,7 @@ function OrgAdminCtrl($rootScope, $scope, Restangular, $routeParams, UserService
       $scope.changeEmailForm.$setPristine();
       $scope.organization = org;
     }, function(resp) {
+      $scope.changingOrganization = false;
       $scope.changeEmailError = result.data.message;
       $timeout(function() {
         $('#changeEmailForm').popover('show');
diff --git a/static/partials/repo-admin.html b/static/partials/repo-admin.html
index c6e33b6b6..d84ec726d 100644
--- a/static/partials/repo-admin.html
+++ b/static/partials/repo-admin.html
@@ -1,5 +1,6 @@
+<div class="container" ng-show="deleting"><div class="quay-spinner"></div></div>
 <div class="resource-view" resource="repository" error-message="'No repository found'"></div>
-<div class="container repo repo-admin" ng-show="repo">
+<div class="container repo repo-admin" ng-show="repo && !deleting">
   <div class="header row">
     <a href="{{ '/repository/' + repo.namespace + '/' + repo.name }}" class="back"><i class="fa fa-chevron-left"></i></a>
     <h3>