diff --git a/lib/Controller/Folder.php b/lib/Controller/Folder.php
index f210a201bc..64a77f4d45 100644
--- a/lib/Controller/Folder.php
+++ b/lib/Controller/Folder.php
@@ -99,9 +99,6 @@ public function grid(Request $request, Response $response, $folderId = null)
         } else {
             // Show a tree view of all folders.
             $rootFolder = $this->folderFactory->getById(1);
-            $rootFolder->setUnmatchedProperty('a_attr', [
-                'title' => __('Right click a Folder for further Options')
-            ]);
 
             // homeFolderId,
             // do we show tree for current user
diff --git a/ui/src/core/xibo-cms.js b/ui/src/core/xibo-cms.js
index 87e996cda6..cc7abbe735 100644
--- a/ui/src/core/xibo-cms.js
+++ b/ui/src/core/xibo-cms.js
@@ -3789,6 +3789,10 @@ function initJsTreeAjax(container, id, isForm, ttl, onReady = null, onSelected =
                     }
                 }
 
+                if (e?.original?.isRoot === 1) {
+                    $(container).find('a#'+e.id+'_anchor').attr('title', translations.folderRootTitle)
+                }
+
                 // get the home folder
                 if (e.type !== undefined && e.type === 'home') {
                     homeNodeId = e.id;
diff --git a/views/base.twig b/views/base.twig
index 967ea0282b..970b5e4784 100644
--- a/views/base.twig
+++ b/views/base.twig
@@ -107,6 +107,7 @@
             translations.folderWithContent = "{{ "Cannot remove Folder with content"|trans }}";
             translations.folderNew = "{{ "New Folder"|trans }}";
             translations.folderTreeMove = "{{ "Move Folder"|trans }}";
+            translations.folderRootTitle = "{{ "Right click a Folder for further Options"|trans }}";
             translations.dayPartExceptionErrorMessage = "{{ "You already set an exception for this day."|trans }}";
             translations.online = "{{ "Online"|trans }}";
             translations.offline = "{{ "Offline"|trans }}";