diff --git a/core/src/plugins/meta.comments/class.CommentsMetaManager.php b/core/src/plugins/meta.comments/class.CommentsMetaManager.php
index a7e1fa4753..8c08ea6436 100644
--- a/core/src/plugins/meta.comments/class.CommentsMetaManager.php
+++ b/core/src/plugins/meta.comments/class.CommentsMetaManager.php
@@ -133,6 +133,7 @@ public function switchActions($actionName, $httpVars, $fileVars)
                 }
                 HTMLWriter::charsetHeader("application/json");
                 $com["hdate"] = AJXP_Utils::relativeDate($com["date"], $mess);
+                $com["path"] = $uniqNode->getPath();
                 echo json_encode($com);
 
                 break;
diff --git a/core/src/plugins/meta.comments/class.CommentsPanel.js b/core/src/plugins/meta.comments/class.CommentsPanel.js
index 7f901c4ffe..d1035383f3 100644
--- a/core/src/plugins/meta.comments/class.CommentsPanel.js
+++ b/core/src/plugins/meta.comments/class.CommentsPanel.js
@@ -158,7 +158,7 @@ Class.create("CommentsPanel", {
         }
         // Fake file/folder detection
         var basename = getBaseName(hash.get('path'));
-        if(basename.indexOf('.') != -1){
+        if(basename && basename.indexOf('.') != -1){
             el.addClassName('comment_type_file');
         }else{
             el.addClassName('comment_type_folder');