diff --git a/src/renderer/components/QueryEditor.vue b/src/renderer/components/QueryEditor.vue
index cf830a16..84ba1cab 100644
--- a/src/renderer/components/QueryEditor.vue
+++ b/src/renderer/components/QueryEditor.vue
@@ -12,7 +12,7 @@
 import * as ace from 'ace-builds';
 import 'ace-builds/webpack-resolver';
 import '../libs/ext-language_tools';
-import { mapGetters } from 'vuex';
+import { mapGetters, mapActions } from 'vuex';
 import Tables from '@/ipc-api/Tables';
 
 export default {
@@ -20,6 +20,7 @@ export default {
    props: {
       value: String,
       workspace: Object,
+      isSelected: Boolean,
       schema: { type: String, default: '' },
       autoFocus: { type: Boolean, default: false },
       readOnly: { type: Boolean, default: false },
@@ -29,15 +30,17 @@ export default {
       return {
          editor: null,
          fields: [],
-         baseCompleter: [],
-         id: null
+         customCompleter: [],
+         id: null,
+         lastSchema: null
       };
    },
    computed: {
       ...mapGetters({
          editorTheme: 'settings/getEditorTheme',
          autoComplete: 'settings/getAutoComplete',
-         lineWrap: 'settings/getLineWrap'
+         lineWrap: 'settings/getLineWrap',
+         baseCompleter: 'application/getBaseCompleter'
       }),
       tables () {
          return this.workspace
@@ -164,10 +167,21 @@ export default {
                wrap: this.lineWrap
             });
          }
+      },
+      isSelected () {
+         if (this.isSelected)
+            this.lastSchema = this.schema;
+      },
+      lastSchema () {
+         if (this.editor) {
+            this.editor.completers = this.baseCompleter.map(el => Object.assign({}, el));
+            this.setCustomCompleter();
+         }
       }
    },
    created () {
       this.id = this._uid;
+      this.lastSchema = this.schema;
    },
    mounted () {
       this.editor = ace.edit(`editor-${this.id}`, {
@@ -186,26 +200,10 @@ export default {
          enableLiveAutocompletion: this.autoComplete
       });
 
-      this.editor.completers.push({
-         getCompletions: (editor, session, pos, prefix, callback) => {
-            const completions = [];
-            [
-               ...this.tables,
-               ...this.triggers,
-               ...this.procedures,
-               ...this.functions,
-               ...this.schedulers
-            ].forEach(el => {
-               completions.push({
-                  value: el.name,
-                  meta: el.type
-               });
-            });
-            callback(null, completions);
-         }
-      });
+      if (!this.baseCompleter.length)
+         this.setBaseCompleters(this.editor.completers.map(el => Object.assign({}, el)));
 
-      this.baseCompleter = this.editor.completers;
+      this.setCustomCompleter();
 
       this.editor.commands.on('afterExec', e => {
          if (['insertstring', 'backspace', 'del'].includes(e.command.name)) {
@@ -228,13 +226,13 @@ export default {
                      }).catch(console.log);
                   }
                   else
-                     this.editor.completers = this.baseCompleter;
+                     this.editor.completers = this.customCompleter;
                }
                else
-                  this.editor.completers = this.baseCompleter;
+                  this.editor.completers = this.customCompleter;
             }
             else
-               this.editor.completers = this.baseCompleter;
+               this.editor.completers = this.customCompleter;
          }
       });
 
@@ -253,6 +251,33 @@ export default {
       setTimeout(() => {
          this.editor.resize();
       }, 20);
+   },
+   methods: {
+      ...mapActions({
+         setBaseCompleters: 'application/setBaseCompleter'
+      }),
+      setCustomCompleter () {
+         this.editor.completers.push({
+            getCompletions: (editor, session, pos, prefix, callback) => {
+               const completions = [];
+               [
+                  ...this.tables,
+                  ...this.triggers,
+                  ...this.procedures,
+                  ...this.functions,
+                  ...this.schedulers
+               ].forEach(el => {
+                  completions.push({
+                     value: el.name,
+                     meta: el.type
+                  });
+               });
+               callback(null, completions);
+            }
+         });
+
+         this.customCompleter = this.editor.completers;
+      }
    }
 };
 </script>
diff --git a/src/renderer/components/WorkspaceQueryTab.vue b/src/renderer/components/WorkspaceQueryTab.vue
index 8dfee150..20a20272 100644
--- a/src/renderer/components/WorkspaceQueryTab.vue
+++ b/src/renderer/components/WorkspaceQueryTab.vue
@@ -2,12 +2,13 @@
    <div v-show="isSelected" class="workspace-query-tab column col-12 columns col-gapless">
       <div class="workspace-query-runner column col-12">
          <QueryEditor
-            v-if="isSelected"
+            v-show="isSelected"
             ref="queryEditor"
             :auto-focus="true"
             :value.sync="query"
             :workspace="workspace"
             :schema="schema"
+            :is-selected="isSelected"
             :height="editorHeight"
          />
          <div ref="resizer" class="query-area-resizer" />
diff --git a/src/renderer/store/modules/application.store.js b/src/renderer/store/modules/application.store.js
index e0812909..f296bac5 100644
--- a/src/renderer/store/modules/application.store.js
+++ b/src/renderer/store/modules/application.store.js
@@ -11,12 +11,14 @@ export default {
       selected_setting_tab: 'general',
       selected_conection: {},
       update_status: 'noupdate', // noupdate, available, checking, nocheck, downloading, downloaded
-      download_progress: 0
+      download_progress: 0,
+      base_completer: [] // Needed to reset ace editor, due global-only ace completer
    },
    getters: {
       isLoading: state => state.is_loading,
       appName: state => state.app_name,
       appVersion: state => state.app_version,
+      getBaseCompleter: state => state.base_completer,
       getSelectedConnection: state => state.selected_conection,
       isNewModal: state => state.is_new_modal,
       isSettingModal: state => state.is_setting_modal,
@@ -28,6 +30,9 @@ export default {
       SET_LOADING_STATUS (state, payload) {
          state.is_loading = payload;
       },
+      SET_BASE_COMPLETER (state, payload) {
+         state.base_completer = payload;
+      },
       SHOW_NEW_CONNECTION_MODAL (state) {
          state.is_new_modal = true;
       },
@@ -52,6 +57,9 @@ export default {
       setLoadingStatus ({ commit }, payload) {
          commit('SET_LOADING_STATUS', payload);
       },
+      setBaseCompleter ({ commit }, payload) {
+         commit('SET_BASE_COMPLETER', payload);
+      },
       // Modals
       showNewConnModal ({ commit }) {
          commit('SHOW_NEW_CONNECTION_MODAL');