diff --git a/frontend/src/_ui/JSONTreeViewer/JSONNode.jsx b/frontend/src/_ui/JSONTreeViewer/JSONNode.jsx
index 97f348e6cd..99223424ab 100644
--- a/frontend/src/_ui/JSONTreeViewer/JSONNode.jsx
+++ b/frontend/src/_ui/JSONTreeViewer/JSONNode.jsx
@@ -327,10 +327,10 @@ export const JSONNode = ({ data, ...restProps }) => {
       <div
         style={{ width: 'inherit' }}
         className={`${shouldDisplayIntendedBlock && 'group-border'} ${applySelectedNodeStyles && 'selected-node'}`}
+        onMouseEnter={() => updateHoveredNode(currentNode, currentNodePath)}
+        onMouseLeave={() => updateHoveredNode(null)}
       >
         <div
-          onMouseEnter={() => updateHoveredNode(currentNode, currentNodePath)}
-          onMouseLeave={() => updateHoveredNode(null)}
           className={cx('d-flex', {
             'group-object-container': shouldDisplayIntendedBlock,
             'mx-2': typeofCurrentNode !== 'Object' && typeofCurrentNode !== 'Array',
diff --git a/frontend/src/_ui/JSONTreeViewer/JSONNodeValue.jsx b/frontend/src/_ui/JSONTreeViewer/JSONNodeValue.jsx
index 1596a50d83..f58ba2b2db 100644
--- a/frontend/src/_ui/JSONTreeViewer/JSONNodeValue.jsx
+++ b/frontend/src/_ui/JSONTreeViewer/JSONNodeValue.jsx
@@ -15,7 +15,11 @@ const JSONTreeValueNode = ({ data, type }) => {
     );
   }
 
-  const value = type === 'String' ? `"${data}"` : String(data);
+  let value = type === 'String' ? `"${data}"` : String(data);
+  if (value.length > 65) {
+    value = `${value.substring(0, 65)} ... "`;
+  }
+
   const clsForUndefinedOrNull = (type === 'Undefined' || type === 'Null') && 'badge badge-secondary';
   return (
     <span
diff --git a/frontend/src/_ui/JSONTreeViewer/JSONTreeViewer.jsx b/frontend/src/_ui/JSONTreeViewer/JSONTreeViewer.jsx
index 82186dadc4..366b54a616 100644
--- a/frontend/src/_ui/JSONTreeViewer/JSONTreeViewer.jsx
+++ b/frontend/src/_ui/JSONTreeViewer/JSONTreeViewer.jsx
@@ -157,10 +157,9 @@ export class JSONTreeViewer extends React.Component {
           newPath = `${path}.${key}`;
         }
 
-        if (_.isObject(value) || _.isArray(value)) {
-          buildMap(value, newPath);
-        } else if (_.isFunction(value)) {
+        if (_.isObject(value)) {
           map.set(newPath, { type: _type });
+          buildMap(value, newPath);
         } else {
           map.set(newPath, { type: _type });
         }