diff --git a/admin/calendar.php b/admin/calendar.php
index 96c98361..27757f42 100644
--- a/admin/calendar.php
+++ b/admin/calendar.php
@@ -68,7 +68,7 @@ while ($row = hesk_dbFetchAssoc($rs)) {
         continue;
     }
 
-    $row['css_style'] = $row['color'] == null ? 'color: black; border: solid 1px #000;' : 'border: solid 1px ' . $row['color'] . '; background: ' . $row['color'];
+    $row['css_style'] = $row['color'] == null ? 'background: white; color: black; border: solid 1px #000;' : 'border: solid 1px ' . $row['color'] . '; background: ' . $row['color'];
     $categories[] = $row;
 }
 
@@ -83,7 +83,6 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
         <ul class="sidebar-menu">
             <li class="header text-uppercase"><?php echo $hesklang['calendar_categories']; ?></li>
             <?php foreach ($categories as $category): ?>
-                <!-- TODO Clean this up -->
                 <li>
                     <div class="ticket-info">
                         <div class="hide-on-overflow no-wrap event-category background-volatile"
diff --git a/js/calendar/mods-for-hesk-calendar.js b/js/calendar/mods-for-hesk-calendar.js
index 1e1adc97..f708d5b8 100644
--- a/js/calendar/mods-for-hesk-calendar.js
+++ b/js/calendar/mods-for-hesk-calendar.js
@@ -22,9 +22,9 @@ $(document).ready(function() {
                         events.push(buildEvent(this.id, this));
                     });
                     callback(events);
+                    updateCategoryVisibility();
                 },
                 error: function(data) {
-                    console.error(data);
                     $.jGrowl($('#lang_error_loading_events').text(), { theme: 'alert-danger', closeTemplate: '' });
                 }
             });