diff --git a/CRM/Core/BAO/Dashboard.php b/CRM/Core/BAO/Dashboard.php
index 5ef7321b15f8..f955da6d6e97 100644
--- a/CRM/Core/BAO/Dashboard.php
+++ b/CRM/Core/BAO/Dashboard.php
@@ -153,20 +153,7 @@ public static function checkPermission($permissions, $operator) {
       foreach ($permissions as $key) {
         $showDashlet = TRUE;
 
-        $componentName = NULL;
-        if (strpos($key, 'access') === 0) {
-          $componentName = trim(substr($key, 6));
-          if (!in_array($componentName, $allComponents)) {
-            $componentName = NULL;
-          }
-        }
-
-        // hack to handle case permissions
-        if (!$componentName
-          && in_array($key, ['access my cases and activities', 'access all cases and activities'])
-        ) {
-          $componentName = 'CiviCase';
-        }
+        $componentName = CRM_Core_Permission::getComponentName($key);
 
         //hack to determine if it's a component related permission
         if ($componentName) {