diff --git a/lib/grade/grade_category.php b/lib/grade/grade_category.php
index 7aeb5130204..453294c183e 100644
--- a/lib/grade/grade_category.php
+++ b/lib/grade/grade_category.php
@@ -1691,11 +1691,14 @@ class grade_category extends grade_object {
         }
 
         //if marking category visible make sure parent category is visible MDL-21367
-        if ($this->is_hidden() != $hidden) {
+        if( !$hidden ) {
             $category_array = grade_category::fetch_all(array('id'=>$this->parent));
             if ($category_array && array_key_exists($this->parent, $category_array)) {
                 $category = $category_array[$this->parent];
-                $category->set_hidden($hidden, false);
+                //call set_hidden on the category regardless of whether it is hidden as its parent might be hidden
+                //if($category->is_hidden()) {
+                    $category->set_hidden($hidden, false);
+                //}
             }
         }
     }
diff --git a/lib/grade/grade_item.php b/lib/grade/grade_item.php
index 29138f7d62a..13744920a24 100644
--- a/lib/grade/grade_item.php
+++ b/lib/grade/grade_item.php
@@ -594,11 +594,14 @@ class grade_item extends grade_object {
         }
 
         //if marking item visible make sure category is visible MDL-21367
-        if ($this->is_hidden() != $hidden) {
+        if( !$hidden ) {
             $category_array = grade_category::fetch_all(array('id'=>$this->categoryid));
             if ($category_array && array_key_exists($this->categoryid, $category_array)) {
                 $category = $category_array[$this->categoryid];
-                $category->set_hidden($hidden, false);
+                //call set_hidden on the category regardless of whether it is hidden as its parent might be hidden
+                //if($category->is_hidden()) {
+                    $category->set_hidden($hidden, false);
+                //}
             }
         }
     }