diff --git a/src/renderer/components/WorkspaceEmptyState.vue b/src/renderer/components/WorkspaceEmptyState.vue
index 653f5bfa..e6496688 100644
--- a/src/renderer/components/WorkspaceEmptyState.vue
+++ b/src/renderer/components/WorkspaceEmptyState.vue
@@ -3,9 +3,6 @@
       <div class="empty-icon">
          <img :src="require(`@/images/logo-${applicationTheme}.svg`).default" width="200">
       </div>
-      <!-- <p class="empty-title h5">
-         {{ $t('message.appWelcome') }}
-      </p> -->
       <p class="h6 empty-subtitle">
          {{ $t('message.noOpenTabs') }}
       </p>
diff --git a/src/renderer/components/WorkspacePropsTabTrigger.vue b/src/renderer/components/WorkspacePropsTabTrigger.vue
index 4da83c29..2757330c 100644
--- a/src/renderer/components/WorkspacePropsTabTrigger.vue
+++ b/src/renderer/components/WorkspacePropsTabTrigger.vue
@@ -152,7 +152,6 @@ export default {
       return {
          isLoading: false,
          isSaving: false,
-         isReady: false,
          originalTrigger: null,
          localTrigger: { sql: '' },
          lastTrigger: null,
@@ -214,18 +213,6 @@ export default {
       },
       isChanged (val) {
          this.setUnsavedChanges({ uid: this.connection.uid, tUid: this.tabUid, isChanged: val });
-
-         if (val) {
-            const triggerName = this.customizations.triggerTableInName ? `${this.originalTrigger.table}.${this.originalTrigger.name}` : this.originalTrigger.name;
-
-            this.newTab({
-               uid: this.connection.uid,
-               elementName: triggerName,
-               schema: this.schema,
-               type: 'trigger-props',
-               elementType: 'trigger'
-            });
-         }
       }
    },
    async created () {
@@ -234,7 +221,7 @@ export default {
       window.addEventListener('keydown', this.onKey);
    },
    mounted () {
-      window.addEventListener('resize', this.resizeQueryEditor); ;
+      window.addEventListener('resize', this.resizeQueryEditor);
    },
    destroyed () {
       window.removeEventListener('resize', this.resizeQueryEditor);
@@ -274,7 +261,6 @@ export default {
                this.originalTrigger = response;
                this.localTrigger = JSON.parse(JSON.stringify(this.originalTrigger));
                this.sqlProxy = this.localTrigger.sql;
-               this.isReady = true;
 
                if (this.customizations.triggerMultipleEvents) {
                   this.originalTrigger.event.forEach(e => {
diff --git a/src/renderer/store/modules/workspaces.store.js b/src/renderer/store/modules/workspaces.store.js
index 051ab3a0..c9254722 100644
--- a/src/renderer/store/modules/workspaces.store.js
+++ b/src/renderer/store/modules/workspaces.store.js
@@ -497,9 +497,6 @@ export default {
          };
 
          commit('ADD_WORKSPACE', workspace);
-
-         // if (getters.getWorkspace(uid).tabs.length < 3)
-         //    dispatch('newTab', { uid, type: 'query' });
       },
       changeBreadcrumbs ({ commit, getters }, payload) {
          const breadcrumbsObj = {
@@ -615,8 +612,23 @@ export default {
                   const tempTabs = workspaceTabs ? workspaceTabs.tabs.filter(tab => tab.type === 'temp-trigger-props') : false;
                   if (tempTabs && tempTabs.length) { // if temp tab already opened
                      for (const tab of tempTabs) {
-                        commit('REPLACE_TAB', { uid, tab: tab.uid, type, schema, elementName, elementType });
-                        tabUid = tab.uid;
+                        if (tab.isChanged) {
+                           commit('REPLACE_TAB', { // make permanent a temp table with unsaved changes
+                              uid,
+                              tab: tab.uid,
+                              type: 'trigger-props',
+                              schema: tab.schema,
+                              elementName: tab.elementName,
+                              elementType: tab.elementType
+                           });
+
+                           tabUid = uidGen('T');
+                           commit('NEW_TAB', { uid, tab: tabUid, content, type, autorun, schema, elementName, elementType });
+                        }
+                        else {
+                           commit('REPLACE_TAB', { uid, tab: tab.uid, type, schema, elementName, elementType });
+                           tabUid = tab.uid;
+                        }
                      }
                   }
                   else {