diff --git a/packages/grafnode-components/src/components/QueryResult/index.js b/packages/grafnode-components/src/components/QueryResult/index.js
index 8486318b2..9546ff70b 100644
--- a/packages/grafnode-components/src/components/QueryResult/index.js
+++ b/packages/grafnode-components/src/components/QueryResult/index.js
@@ -12,7 +12,13 @@ const QueryResult = ({data, isLoading, width}) => {
     if (editor.current && !cmEditor) {
       const _cmEditor = CodeMirror.fromTextArea(editor.current, {
         value: '',
-        lineNumbers: true
+        lineNumbers: true,
+        matchBrackets: true,
+        autoCloseBrackets: true,
+        mode: "application/json",
+        foldGutter: true,
+        gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter"],
+        lineWrapping: true
       });
 
       setCmEditor(_cmEditor);
diff --git a/packages/grafnode-run/src/pageComponents/Main/index.js b/packages/grafnode-run/src/pageComponents/Main/index.js
index 7c7d35dd5..a6f7f0f24 100644
--- a/packages/grafnode-run/src/pageComponents/Main/index.js
+++ b/packages/grafnode-run/src/pageComponents/Main/index.js
@@ -9,6 +9,13 @@ import actions from 'providers/Store/actions';
 import { useStore } from '../../providers/Store/index';
 import StyledWrapper from './StyledWrapper';
 
+import 'codemirror/mode/javascript/javascript';
+import 'codemirror/addon/edit/matchbrackets';
+import 'codemirror/addon/fold/brace-fold';
+import 'codemirror/addon/fold/foldgutter';
+
+import 'codemirror/addon/fold/foldgutter.css';
+
 const RequestTabPanel = dynamic(import('@grafnode/components').then(mod => mod.RequestTabPanel), { ssr: false });
 
 export default function Main() {