diff --git a/src/renderer/components/BaseSelect.vue b/src/renderer/components/BaseSelect.vue
index ea9c117a..8dc5106b 100644
--- a/src/renderer/components/BaseSelect.vue
+++ b/src/renderer/components/BaseSelect.vue
@@ -308,6 +308,8 @@ export default defineComponent({
       };
 
       const adjustListPosition = () => {
+         if (!optionList.value) return;
+
          const element = el.value;
          let { left, top } = element.getBoundingClientRect();
          const { left: offsetLeft = 0, top: offsetTop = 0 } = props.dropdownOffsets;
diff --git a/src/renderer/components/WorkspaceTabQueryTable.vue b/src/renderer/components/WorkspaceTabQueryTable.vue
index ce72c893..4ce3b8d8 100644
--- a/src/renderer/components/WorkspaceTabQueryTable.vue
+++ b/src/renderer/components/WorkspaceTabQueryTable.vue
@@ -4,6 +4,7 @@
       class="vscroll no-outline"
       tabindex="0"
       :style="{'height': resultsSize+'px'}"
+      @blur="deselectRows"
       @keyup.delete="showDeleteConfirmModal"
       @keydown.esc="deselectRows"
    >
@@ -451,8 +452,10 @@ const selectAllRows = (e: KeyboardEvent) => {
 };
 
 const deselectRows = () => {
-   if (!isEditingRow.value)
+   if (!isEditingRow.value) {
       selectedRows.value = [];
+      selectedField.value = null;
+   }
 };
 
 const contextMenu = (event: MouseEvent, cell: any) => {