diff --git a/static/directives/repo-view/repo-panel-tags.html b/static/directives/repo-view/repo-panel-tags.html
index d34fab7ff..665762e0a 100644
--- a/static/directives/repo-view/repo-panel-tags.html
+++ b/static/directives/repo-view/repo-panel-tags.html
@@ -341,7 +341,8 @@
   <div class="empty-secondary-msg">Try expanding your filtering terms.</div>
  </div>
 
- <div class="empty" ng-if="!allTags.length">
+ <div class="cor-loader" ng-show="tagsLoading"></div>
+ <div class="empty" ng-if="!allTags.length && !tagsLoading">
   <div class="empty-primary-msg">This repository is empty.</div>
   <div class="empty-secondary-msg">Push a tag or initiate a build to populate this repository.</div>
  </div>
diff --git a/static/js/pages/repo-view.js b/static/js/pages/repo-view.js
index c3b04ba8d..cdd2b54bb 100644
--- a/static/js/pages/repo-view.js
+++ b/static/js/pages/repo-view.js
@@ -31,7 +31,8 @@
       'imageLoader': imageLoader,
       'builds': null,
       'historyFilter': '',
-      'repositoryTags': null
+      'repositoryTags': null,
+      'tagsLoading': true
     };
 
     $scope.repositoryTags = {};
@@ -77,7 +78,9 @@
 
         if (resp.has_additional) {
           loadPaginatedRepositoryTags(page + 1);
-        }
+        } else {
+	  $scope.viewScope.tagsLoading = false;
+	}
       });
     };
 
diff --git a/static/partials/repo-view.html b/static/partials/repo-view.html
index 046f63fc1..0074aae8c 100644
--- a/static/partials/repo-view.html
+++ b/static/partials/repo-view.html
@@ -77,6 +77,7 @@
             <div class="repo-panel-tags"
                  repository="viewScope.repository"
                  repository-tags="viewScope.repositoryTags"
+                 tags-loading="viewscope.tagsLoading"
                  image-loader="viewScope.imageLoader"
                  selected-tags="viewScope.selectedTags"
                  history-filter="viewScope.historyFilter"