diff --git a/src/tags/catalog.tag b/src/tags/catalog.tag
index c5cfe03..5632f65 100644
--- a/src/tags/catalog.tag
+++ b/src/tags/catalog.tag
@@ -23,7 +23,7 @@
     <div hide="{ registryUI.catalog.loadend }" class="spinner-wrapper">
       <material-spinner></material-spinner>
     </div>
-    <ul class="list" show="{ registryUI.catalog.loadend }">
+    <ul class="list highlight" show="{ registryUI.catalog.loadend }">
       <li each="{ item in registryUI.catalog.repositories }" onclick="registryUI.catalog.go('{item}');">
         <span>
           <i class="material-icons">send</i>
@@ -39,6 +39,7 @@
     registryUI.catalog.display = function () {
       var oReq = new Http();
       oReq.addEventListener('load', function () {
+        registryUI.catalog.repositories = [];
         if (this.status == 200) {
           registryUI.catalog.repositories = JSON.parse(this.responseText).repositories || [];
           registryUI.catalog.repositories.sort();
@@ -50,6 +51,7 @@
       });
       oReq.addEventListener('error', function () {
         registryUI.snackbar('An error occured', true);
+        registryUI.catalog.repositories = [];
       });
       oReq.addEventListener('loadend', function () {
         registryUI.catalog.loadend = true;
diff --git a/src/tags/taglist.tag b/src/tags/taglist.tag
index d431ec2..4c50958 100644
--- a/src/tags/taglist.tag
+++ b/src/tags/taglist.tag
@@ -56,6 +56,7 @@
         registryUI.taglist.name = name;
         registryUI.taglist.instance.update();
         oReq.addEventListener('load', function () {
+          registryUI.taglist.tags = [];
           if (this.status == 200) {
             registryUI.taglist.tags = JSON.parse(this.responseText).tags || [];
             registryUI.taglist.tags.sort();
@@ -67,6 +68,7 @@
         });
         oReq.addEventListener('error', function () {
           registryUI.snackbar('An error occured', true);
+            registryUI.taglist.tags = [];
         });
         oReq.addEventListener('loadend', function () {
           registryUI.taglist.loadend = true;