diff --git a/src/main/js/components/editor/editor.js b/src/main/js/components/editor/editor.js
index 63886e3..6257c4e 100644
--- a/src/main/js/components/editor/editor.js
+++ b/src/main/js/components/editor/editor.js
@@ -35,13 +35,13 @@ function Editor({query, setQuery, handleRunQuery, handleFormatQuery}) {
             if (handleFormatQuery) {
                 commands.push({
                     name: 'format query',
-                    exec: handleFormatQuery,
+                    exec: () => handleFormatQuery(query),
                     bindKey: {mac: "Command-Option-L", win: "Ctrl-Alt-L"}
                 })
             }
             editor.commands.addCommands(commands)
         }
-    }, [editorRef?.current?.editor])
+    }, [editorRef?.current?.editor, query])
 
     return (<AceEditor
         ref={editorRef}
diff --git a/src/main/js/routes/schema/query.js b/src/main/js/routes/schema/query.js
index 7547d1b..ea61501 100644
--- a/src/main/js/routes/schema/query.js
+++ b/src/main/js/routes/schema/query.js
@@ -16,7 +16,7 @@ function Query({containerUrl, schema}) {
         runQuery()
     }
 
-    function prettifyJsonQuery() {
+    function prettifyJsonQuery(query) {
         try {
             setQuery(JSON.stringify(JSON.parse(query), null, 2))
         } catch (_) {
@@ -69,7 +69,7 @@ function Query({containerUrl, schema}) {
                 data-tooltip-id="vispana-tooltip"
                 data-tooltip-content="Format Query (Cmd+Opt+L)"
                 data-tooltip-place="top"
-                onClick={prettifyJsonQuery}>
+                onClick={(e) => prettifyJsonQuery(query)}>
                 <i className="fas fa-code "/>
             </button>
             <button type="button"