diff --git a/static/css/directives/ui/repo-list-table.css b/static/css/directives/ui/repo-list-table.css
index fb2c3ad47..437d3df86 100644
--- a/static/css/directives/ui/repo-list-table.css
+++ b/static/css/directives/ui/repo-list-table.css
@@ -1,7 +1,3 @@
-.repo-list-table {
-  margin-top: 40px;
-}
-
 .repo-list-table .repo-name-icon .avatar {
   margin-right: 10px;
 }
diff --git a/static/css/directives/ui/repo-list-view.css b/static/css/directives/ui/repo-list-view.css
index 321feb64a..46076a7f3 100644
--- a/static/css/directives/ui/repo-list-view.css
+++ b/static/css/directives/ui/repo-list-view.css
@@ -2,3 +2,7 @@
   float: right;
   margin-bottom: 10px;
 }
+
+.repo-list-view-element {
+    min-height: 40px;
+}
\ No newline at end of file
diff --git a/static/directives/repo-list-view.html b/static/directives/repo-list-view.html
index efb944901..5de3e20d4 100644
--- a/static/directives/repo-list-view.html
+++ b/static/directives/repo-list-view.html
@@ -1,6 +1,6 @@
 <div class="repo-list-view-element">
   <!-- Toggle -->
-  <div class="repo-list-toggleb btn-group">
+  <div class="repo-list-toggleb btn-group" ng-show="!loading">
     <i class="btn btn-default fa fa-th-large" ng-class="!showAsList ? 'active' : ''"
        ng-click="setShowAsList(false)" title="Grid View" data-container="body" bs-tooltip></i>
     <i class="btn btn-default fa fa-th-list" ng-class="showAsList ? 'active' : ''"
diff --git a/static/js/directives/ui/repo-list-view.js b/static/js/directives/ui/repo-list-view.js
index a578e9413..2a5733e5e 100644
--- a/static/js/directives/ui/repo-list-view.js
+++ b/static/js/directives/ui/repo-list-view.js
@@ -15,15 +15,20 @@ angular.module('quay').directive('repoListView', function () {
     },
     controller: function($scope, $element, CookieService) {
       $scope.resources = [];
+      $scope.loading = true;
       $scope.showAsList = CookieService.get('quay.repoview') == 'list';
 
       $scope.$watch('namespaces', function(namespaces) {
         if (!namespaces) { return; }
 
+        $scope.loading = false;
         $scope.resources = [];
         namespaces.forEach(function(namespace) {
           if (namespace && namespace.repositories) {
             $scope.resources.push(namespace.repositories);
+            if (namespace.repositories.loading) {
+              $scope.loading = true;
+            }
           }
         });
       }, true);