diff --git a/tools/jsdoc/plugins/hifi.js b/tools/jsdoc/plugins/hifi.js
index b4350ddbdb..bd77204347 100644
--- a/tools/jsdoc/plugins/hifi.js
+++ b/tools/jsdoc/plugins/hifi.js
@@ -121,6 +121,11 @@ exports.handlers = {
                 e.doclet.description = (e.doclet.description ? e.doclet.description : "") + availableIn;
             }            
         }
+
+        if (e.doclet.kind === "function" && e.doclet.returns && e.doclet.returns[0].type
+                && e.doclet.returns[0].type.names[0] === "Signal") {
+            e.doclet.kind = "signal";
+        }
     }
 };
 
@@ -178,4 +183,4 @@ exports.defineTags = function (dictionary) {
         }
     });
 
-};
\ No newline at end of file
+};