diff --git a/components/ace-editor.vue b/components/ace-editor.vue
index a07aa2606..a54e4c241 100644
--- a/components/ace-editor.vue
+++ b/components/ace-editor.vue
@@ -60,10 +60,16 @@ export default {
       ...this.options
     });
 
-    editor.setValue(this.value);
+    if (this.value) editor.setValue(this.value, 1);
 
     this.editor = editor;
     this.cacheValue = this.value;
+    
+    editor.on('change', () => {
+      const content = editor.getValue();
+      this.$emit("input", content);
+      this.cacheValue = content;
+    });
   },
 
   methods: {
diff --git a/pages/graphql.vue b/pages/graphql.vue
index 20070b16b..be61af9a2 100644
--- a/pages/graphql.vue
+++ b/pages/graphql.vue
@@ -171,7 +171,17 @@
               </button>
             </div>
           </div>
-          <textarea id="gqlQuery" rows="8" v-model="gqlQueryString"></textarea>
+          <Editor
+            v-model="gqlQueryString"
+            :options="{
+              maxLines: responseBodyMaxLines,
+              minLines: '16',
+              fontSize: '16px',
+              autoScrollEditorIntoView: true,
+              showPrintMargin: false,
+              useWorker: false
+            }"
+          />
         </pw-section>
         <pw-section class="purple" label="Response" ref="response">
           <div class="flex-wrap">
diff --git a/pages/index.vue b/pages/index.vue
index ca978d813..4e0f00ea1 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -24,14 +24,18 @@
                   </a>
                 </div>
               </div>
-              <textarea
-                id="preRequestScript"
-                @keydown="formatRawParams"
-                rows="8"
+              <Editor
                 v-model="preRequestScript"
-                spellcheck="false"
-                placeholder="pw.env.set('variable', 'value');"
-              ></textarea>
+                :lang="'javascript'"
+                :options="{
+                  maxLines: responseBodyMaxLines,
+                  minLines: '16',
+                  fontSize: '16px',
+                  autoScrollEditorIntoView: true,
+                  showPrintMargin: false,
+                  useWorker: false
+                }"
+              />
             </li>
           </ul>
         </pw-section>
@@ -626,7 +630,7 @@
                 </div>
               </div>
               <div id="response-details-wrapper">
-                <ResponseBody
+                <Editor
                   :value="responseBodyText"
                   :lang="responseBodyType"
                   :options="{
@@ -860,13 +864,13 @@ export default {
     autocomplete: () => import("../components/autocomplete"),
     collections: () => import("../components/collections"),
     saveRequestAs: () => import("../components/collections/saveRequestAs"),
-    ResponseBody: AceEditor
+    Editor: AceEditor
   },
   data() {
     return {
       showModal: false,
       showPreRequestScript: false,
-      preRequestScript: "",
+      preRequestScript: "// pw.env.set('variable', 'value');",
       copyButton: '<i class="material-icons">file_copy</i>',
       downloadButton: '<i class="material-icons">get_app</i>',
       doneButton: '<i class="material-icons">done</i>',