diff --git a/src/renderer/components/BaseConfirmModal.vue b/src/renderer/components/BaseConfirmModal.vue
index 80466343..7fd1f4a8 100644
--- a/src/renderer/components/BaseConfirmModal.vue
+++ b/src/renderer/components/BaseConfirmModal.vue
@@ -66,7 +66,7 @@ const props = defineProps({
 const emit = defineEmits(['confirm', 'hide']);
 const slots = useSlots();
 
-const { trapRef } = useFocusTrap();
+const { trapRef } = useFocusTrap({ disableAutofocus: true });
 
 const hasHeader = computed(() => !!slots.header);
 const hasBody = computed(() => !!slots.body);
diff --git a/src/renderer/components/WorkspaceTabQueryTable.vue b/src/renderer/components/WorkspaceTabQueryTable.vue
index 6a749b34..e9c47f71 100644
--- a/src/renderer/components/WorkspaceTabQueryTable.vue
+++ b/src/renderer/components/WorkspaceTabQueryTable.vue
@@ -339,6 +339,8 @@ const closeContext = () => {
 const showDeleteConfirmModal = (e: any) => {
    if (e && e.path && ['INPUT', 'TEXTAREA', 'SELECT'].includes(e.path[0].tagName))
       return;
+   if (selectedRows.value.length === 0) return;
+
    isDeleteConfirmModal.value = true;
 };
 
@@ -453,11 +455,12 @@ const selectAllRows = (e: KeyboardEvent) => {
    }, []);
 };
 
-const deselectRows = () => {
+const deselectRows = (e: Event) => {
    if (!isEditingRow.value) {
       selectedRows.value = [];
       selectedField.value = null;
-      hasFocus.value = false;
+      if (e.type === 'blur')
+         hasFocus.value = false;
    }
 };