diff --git a/src/main/libs/clients/MySQLClient.js b/src/main/libs/clients/MySQLClient.js
index b8e2cae2..0569f9bb 100644
--- a/src/main/libs/clients/MySQLClient.js
+++ b/src/main/libs/clients/MySQLClient.js
@@ -177,7 +177,7 @@ export class MySQLClient extends AntaresCore {
          return {
             name: field.COLUMN_NAME,
             key: field.COLUMN_KEY.toLowerCase(),
-            type: field.DATA_TYPE,
+            type: field.DATA_TYPE.toUpperCase(),
             schema: field.TABLE_SCHEMA,
             table: field.TABLE_NAME,
             numPrecision: field.NUMERIC_PRECISION,
diff --git a/src/renderer/components/WorkspacePropsTableRow.vue b/src/renderer/components/WorkspacePropsTableRow.vue
index 3c9cafa3..b309499b 100644
--- a/src/renderer/components/WorkspacePropsTableRow.vue
+++ b/src/renderer/components/WorkspacePropsTableRow.vue
@@ -36,14 +36,14 @@
          >
       </div>
       <div
-         class="td text-uppercase text-left"
+         class="td text-uppercase"
          tabindex="0"
-         :class="`type-${lowerCase(localRow.type)}`"
       >
          <span
             v-if="!isInlineEditor.type"
-            class="cell-content"
-            @dblclick="editON($event, localRow.type.toUpperCase(), 'type')"
+            class="cell-content text-left"
+            :class="`type-${lowerCase(localRow.type)}`"
+            @click="editON($event, localRow.type.toUpperCase(), 'type')"
          >
             {{ localRow.type }}
          </span>
@@ -51,7 +51,7 @@
             v-else
             ref="editField"
             v-model="editingContent"
-            class="editable-field px-1 text-uppercase"
+            class="form-select editable-field small-select text-uppercase"
             @blur="editOFF"
          >
             <optgroup
@@ -148,7 +148,7 @@
             <span
                v-if="!isInlineEditor.collation"
                class="cell-content"
-               @dblclick="editON($event, localRow.collation, 'collation')"
+               @click="editON($event, localRow.collation, 'collation')"
             >
                {{ localRow.collation }}
             </span>
@@ -156,7 +156,7 @@
                v-else
                ref="editField"
                v-model="editingContent"
-               class="editable-field px-1"
+               class="form-select small-select editable-field"
                @blur="editOFF"
             >
                <option
@@ -301,6 +301,7 @@ export default {
             onUpdate: ''
          },
          editingContent: null,
+         originalContent: null,
          editingField: null
       };
    },
@@ -401,6 +402,7 @@ export default {
             this.editingField = field;
 
          this.editingContent = content;
+         this.originalContent = content;
 
          const obj = { [field]: true };
          this.isInlineEditor = { ...this.isInlineEditor, ...obj };
@@ -418,10 +420,10 @@ export default {
       editOFF () {
          this.localRow[this.editingField] = this.editingContent;
 
-         if (this.editingField === 'type') {
-            this.localRow.numLength = false;
-            this.localRow.charLength = false;
-            this.localRow.datePrecision = false;
+         if (this.editingField === 'type' && this.editingContent !== this.originalContent) {
+            this.localRow.numLength = null;
+            this.localRow.charLength = null;
+            this.localRow.datePrecision = null;
 
             if (this.fieldType.length) {
                if (['integer', 'float', 'binary', 'spatial'].includes(this.fieldType.group)) this.localRow.numLength = 11;
@@ -464,6 +466,7 @@ export default {
          });
 
          this.editingContent = null;
+         this.originalContent = null;
          this.editingField = null;
       },
       hideDefaultModal () {
diff --git a/src/renderer/components/WorkspaceQueryTable.vue b/src/renderer/components/WorkspaceQueryTable.vue
index 290d8be9..3bc592e3 100644
--- a/src/renderer/components/WorkspaceQueryTable.vue
+++ b/src/renderer/components/WorkspaceQueryTable.vue
@@ -231,7 +231,6 @@ export default {
          return row[primaryFieldName];
       },
       setLocalResults () {
-         // this.resetSort();
          this.localResults = this.resultsWithRows[this.resultsetIndex] && this.resultsWithRows[this.resultsetIndex].rows
             ? this.resultsWithRows[this.resultsetIndex].rows.map(item => {
                return { ...item, _id: uidGen() };
diff --git a/src/renderer/components/WorkspaceQueryTableRow.vue b/src/renderer/components/WorkspaceQueryTableRow.vue
index bce26079..b2133b2d 100644
--- a/src/renderer/components/WorkspaceQueryTableRow.vue
+++ b/src/renderer/components/WorkspaceQueryTableRow.vue
@@ -274,7 +274,7 @@ export default {
          if (field)
             type = field.type;
 
-         return type;
+         return type.toLowerCase();
       },
       getFieldPrecision (cKey) {
          let length = 0;
diff --git a/src/renderer/scss/main.scss b/src/renderer/scss/main.scss
index 24d3f62c..846fd891 100644
--- a/src/renderer/scss/main.scss
+++ b/src/renderer/scss/main.scss
@@ -180,6 +180,12 @@ body {
 
 .form-select {
   cursor: pointer;
+
+  &.small-select {
+    height: 1rem;
+    font-size: 0.7rem;
+    padding: 1px 0.4rem 0;
+  }
 }
 
 .form-select,