diff --git a/src/renderer/components/BaseConfirmModal.vue b/src/renderer/components/BaseConfirmModal.vue
index f36d7325..09b3e6ac 100644
--- a/src/renderer/components/BaseConfirmModal.vue
+++ b/src/renderer/components/BaseConfirmModal.vue
@@ -24,7 +24,7 @@
                <slot name="body" />
             </div>
          </div>
-         <div class="modal-footer">
+         <div class="modal-footer pt-0">
             <button
                class="btn btn-primary mr-2"
                @click.stop="confirmModal"
diff --git a/src/renderer/components/BaseTextEditor.vue b/src/renderer/components/BaseTextEditor.vue
new file mode 100644
index 00000000..c6f39d1c
--- /dev/null
+++ b/src/renderer/components/BaseTextEditor.vue
@@ -0,0 +1,129 @@
+<template>
+   <div class="editor-wrapper">
+      <div
+         :id="`editor-${id}`"
+         class="editor"
+         :class="editorClass"
+         :style="{height: `${height}px`}"
+      />
+   </div>
+</template>
+
+<script>
+import * as ace from 'ace-builds';
+import 'ace-builds/webpack-resolver';
+import { mapGetters } from 'vuex';
+
+export default {
+   name: 'BaseTextEditor',
+   props: {
+      value: String,
+      mode: { type: String, default: 'text' },
+      editorClass: { type: String, default: '' },
+      autoFocus: { type: Boolean, default: false },
+      readOnly: { type: Boolean, default: false },
+      height: { type: Number, default: 200 }
+   },
+   data () {
+      return {
+         editor: null,
+         id: null
+      };
+   },
+   computed: {
+      ...mapGetters({
+         editorTheme: 'settings/getEditorTheme',
+         autoComplete: 'settings/getAutoComplete',
+         lineWrap: 'settings/getLineWrap'
+      })
+   },
+   watch: {
+      mode () {
+         if (this.editor)
+            this.editor.session.setMode(`ace/mode/${this.mode}`);
+      },
+      editorTheme () {
+         if (this.editor)
+            this.editor.setTheme(`ace/theme/${this.editorTheme}`);
+      },
+      autoComplete () {
+         if (this.editor) {
+            this.editor.setOptions({
+               enableLiveAutocompletion: this.autoComplete
+            });
+         }
+      },
+      lineWrap () {
+         if (this.editor) {
+            this.editor.setOptions({
+               wrap: this.lineWrap
+            });
+         }
+      }
+   },
+   created () {
+      this.id = this._uid;
+   },
+   mounted () {
+      this.editor = ace.edit(`editor-${this.id}`, {
+         mode: `ace/mode/${this.mode}`,
+         theme: `ace/theme/${this.editorTheme}`,
+         value: this.value,
+         fontSize: '14px',
+         printMargin: false,
+         readOnly: this.readOnly
+      });
+
+      this.editor.setOptions({
+         enableBasicAutocompletion: false,
+         wrap: this.lineWrap,
+         enableSnippets: false,
+         enableLiveAutocompletion: false
+      });
+
+      this.editor.session.on('change', () => {
+         const content = this.editor.getValue();
+         this.$emit('update:value', content);
+      });
+
+      if (this.autoFocus) {
+         setTimeout(() => {
+            this.editor.focus();
+            this.editor.resize();
+         }, 20);
+      }
+
+      setTimeout(() => {
+         this.editor.resize();
+      }, 20);
+   }
+};
+</script>
+
+<style lang="scss" scoped>
+.editor-wrapper {
+  border-bottom: 1px solid #444;
+
+  .editor {
+    width: 100%;
+  }
+}
+
+.ace_.mdi {
+  display: inline-block;
+  width: 17px;
+}
+
+.ace_dark.ace_editor.ace_autocomplete .ace_marker-layer .ace_active-line {
+  background-color: #c9561a99;
+}
+
+.ace_dark.ace_editor.ace_autocomplete .ace_marker-layer .ace_line-hover {
+  background-color: #c9571a33;
+  border: none;
+}
+
+.ace_dark.ace_editor.ace_autocomplete .ace_completion-highlight {
+  color: #e0d00c;
+}
+</style>
diff --git a/src/renderer/components/QueryEditor.vue b/src/renderer/components/QueryEditor.vue
index b16966f8..cf830a16 100644
--- a/src/renderer/components/QueryEditor.vue
+++ b/src/renderer/components/QueryEditor.vue
@@ -1,7 +1,7 @@
 <template>
    <div class="editor-wrapper">
       <div
-         ref="editor"
+         :id="`editor-${id}`"
          class="editor"
          :style="{height: `${height}px`}"
       />
@@ -29,7 +29,8 @@ export default {
       return {
          editor: null,
          fields: [],
-         baseCompleter: []
+         baseCompleter: [],
+         id: null
       };
    },
    computed: {
@@ -165,8 +166,11 @@ export default {
          }
       }
    },
+   created () {
+      this.id = this._uid;
+   },
    mounted () {
-      this.editor = ace.edit(this.$refs.editor, {
+      this.editor = ace.edit(`editor-${this.id}`, {
          mode: `ace/mode/${this.mode}`,
          theme: `ace/theme/${this.editorTheme}`,
          value: this.value,
diff --git a/src/renderer/components/WorkspaceExploreBarDatabase.vue b/src/renderer/components/WorkspaceExploreBarDatabase.vue
index b5f8c4cf..261f211b 100644
--- a/src/renderer/components/WorkspaceExploreBarDatabase.vue
+++ b/src/renderer/components/WorkspaceExploreBarDatabase.vue
@@ -256,12 +256,12 @@ export default {
 
 <style lang="scss">
 .workspace-explorebar-database {
-   .database-name{
-      position: sticky;
-      top: 0;
-      background: $bg-color-gray;
-      z-index: 2;
-   }
+  .database-name {
+    position: sticky;
+    top: 0;
+    background: $bg-color-gray;
+    z-index: 2;
+  }
 
   .database-name,
   .misc-name,
diff --git a/src/renderer/components/WorkspaceQueryTableRow.vue b/src/renderer/components/WorkspaceQueryTableRow.vue
index 10337813..585c4cc7 100644
--- a/src/renderer/components/WorkspaceQueryTableRow.vue
+++ b/src/renderer/components/WorkspaceQueryTableRow.vue
@@ -61,14 +61,48 @@
          <div :slot="'body'">
             <div class="mb-2">
                <div>
-                  <textarea
-                     v-model="editingContent"
-                     class="form-input textarea-editor"
+                  <TextEditor
+                     :value.sync="editingContent"
+                     editor-class="textarea-editor"
+                     :mode="editorMode"
                   />
                </div>
-               <div class="editor-field-info">
+               <div class="editor-field-info p-vcentered">
                   <div><b>{{ $t('word.size') }}</b>: {{ editingContent ? editingContent.length : 0 }}</div>
-                  <div><b>{{ $t('word.type') }}</b>: {{ editingType.toUpperCase() }}</div>
+                  <div class="d-flex">
+                     <div class="d-flex p-vcentered mr-4">
+                        <label for="editorMode" class="form-label mr-2">
+                           <b>{{ $t('word.content') }}</b>:
+                        </label>
+                        <select
+                           id="editorMode"
+                           v-model="editorMode"
+                           class="form-select select-sm"
+                        >
+                           <option value="text">
+                              TEXT
+                           </option>
+                           <option value="html">
+                              HTML
+                           </option>
+                           <option value="xml">
+                              XML
+                           </option>
+                           <option value="json">
+                              JSON
+                           </option>
+                           <option value="svg">
+                              SVG
+                           </option>
+                           <option value="yaml">
+                              YAML
+                           </option>
+                        </select>
+                     </div>
+                     <div class="p-vcentered">
+                        <b>{{ $t('word.type') }}</b>: {{ editingType.toUpperCase() }}
+                     </div>
+                  </div>
                </div>
             </div>
          </div>
@@ -138,12 +172,14 @@ import hexToBinary from 'common/libs/hexToBinary';
 import { TEXT, LONG_TEXT, NUMBER, FLOAT, DATE, TIME, DATETIME, BLOB, BIT } from 'common/fieldTypes';
 import { mask } from 'vue-the-mask';
 import ConfirmModal from '@/components/BaseConfirmModal';
+import TextEditor from '@/components/BaseTextEditor';
 import ForeignKeySelect from '@/components/ForeignKeySelect';
 
 export default {
    name: 'WorkspaceQueryTableRow',
    components: {
       ConfirmModal,
+      TextEditor,
       ForeignKeySelect
    },
    directives: {
@@ -206,6 +242,7 @@ export default {
          editingContent: null,
          editingType: null,
          editingField: null,
+         editorMode: 'text',
          contentInfo: {
             ext: '',
             mime: '',
@@ -473,7 +510,7 @@ export default {
 }
 
 .editor-field-info {
-  margin-top: 0.6rem;
+  margin-top: 0.4rem;
   display: flex;
   justify-content: space-between;
   white-space: normal;
diff --git a/src/renderer/i18n/en-US.js b/src/renderer/i18n/en-US.js
index 46cd38cd..dfdb3ad2 100644
--- a/src/renderer/i18n/en-US.js
+++ b/src/renderer/i18n/en-US.js
@@ -93,7 +93,8 @@ module.exports = {
       ciphers: 'Ciphers',
       upload: 'Upload',
       browse: 'Browse',
-      faker: 'Faker'
+      faker: 'Faker',
+      content: 'Content'
    },
    message: {
       appWelcome: 'Welcome to Antares SQL Client!',