diff --git a/packages/bruno-app/src/components/RequestPane/QueryBuilder/FieldNode.js b/packages/bruno-app/src/components/RequestPane/QueryBuilder/FieldNode.js
index c80912943..896fc0af7 100644
--- a/packages/bruno-app/src/components/RequestPane/QueryBuilder/FieldNode.js
+++ b/packages/bruno-app/src/components/RequestPane/QueryBuilder/FieldNode.js
@@ -231,12 +231,6 @@ const FieldNode = ({
         role="treeitem"
         aria-expanded={isExpanded}
         onClick={handleExpand}
-        onKeyDown={(e) => {
-          if (e.key === 'Enter' || e.key === ' ') {
-            e.preventDefault();
-            handleExpand(e);
-          }
-        }}
         tabIndex={0}
       >
         <span className="field-indent" style={{ width: indent }} />
@@ -269,12 +263,6 @@ const FieldNode = ({
         role="treeitem"
         aria-expanded={canExpand ? isExpanded : undefined}
         onClick={handleExpand}
-        onKeyDown={(e) => {
-          if (e.key === 'Enter' || e.key === ' ') {
-            e.preventDefault();
-            handleExpand(e);
-          }
-        }}
         tabIndex={0}
       >
         <span className="field-indent" style={{ width: indent }} />
@@ -420,12 +408,6 @@ const InputObjectArgRow = ({ arg, argKey, fieldPath, isArgEnabled, sectionIndent
         className="arg-row"
         style={{ paddingLeft: sectionIndent + 8 }}
         onClick={toggleExpand}
-        onKeyDown={(e) => {
-          if (e.key === 'Enter' || e.key === ' ') {
-            e.preventDefault();
-            toggleExpand(e);
-          }
-        }}
         tabIndex={0}
         role="button"
         aria-expanded={isExpanded}
@@ -487,12 +469,6 @@ const ListArgRow = ({ arg, fieldPath, isArgEnabled, argValue, sectionIndent, onT
         className="arg-row"
         style={{ paddingLeft: sectionIndent + 8 }}
         onClick={toggleExpand}
-        onKeyDown={(e) => {
-          if (e.key === 'Enter' || e.key === ' ') {
-            e.preventDefault();
-            toggleExpand(e);
-          }
-        }}
         tabIndex={0}
         role="button"
         aria-expanded={isExpanded}
diff --git a/packages/bruno-app/src/components/RequestPane/QueryBuilder/StyledWrapper.js b/packages/bruno-app/src/components/RequestPane/QueryBuilder/StyledWrapper.js
index 99d8617f1..0e876101d 100644
--- a/packages/bruno-app/src/components/RequestPane/QueryBuilder/StyledWrapper.js
+++ b/packages/bruno-app/src/components/RequestPane/QueryBuilder/StyledWrapper.js
@@ -211,7 +211,12 @@ const StyledWrapper = styled.div`
     padding: 3px 8px;
     font-size: 13px;
     min-width: 0;
-    cursor: default;
+    cursor: pointer;
+
+    &:hover,
+    &:focus-visible {
+      background: ${(props) => props.theme.background.surface0};
+    }
 
     .input-object-chevron {
       width: 14px;