diff --git a/packages/nc-gui/components/cell/Checkbox.vue b/packages/nc-gui/components/cell/Checkbox.vue
index c6bfecc871..38bc569923 100644
--- a/packages/nc-gui/components/cell/Checkbox.vue
+++ b/packages/nc-gui/components/cell/Checkbox.vue
@@ -96,10 +96,9 @@ useSelectedCellKeyupListener(active, (e) => {
       height:
         isForm || isExpandedFormOpen || isGallery || isEditColumnMenu ? undefined : `max(${(rowHeight || 1) * 1.8}rem, 41px)`,
     }"
-    tabindex="0"
+    :tabindex="readOnly ? -1 : 0"
     @click="onClick(false, $event)"
     @keydown.enter.stop="onClick(true, $event)"
-    :tabindex="readOnly ? -1 : 0"
   >
     <div
       class="flex items-center"
diff --git a/packages/nc-gui/components/cell/Currency.vue b/packages/nc-gui/components/cell/Currency.vue
index f7ca6e7af9..d43e5ac26b 100644
--- a/packages/nc-gui/components/cell/Currency.vue
+++ b/packages/nc-gui/components/cell/Currency.vue
@@ -6,11 +6,11 @@ import {
   EditModeInj,
   IsExpandedFormOpenInj,
   IsFormInj,
+  ReadonlyInj,
   computed,
   inject,
   parseProp,
   useVModel,
-  ReadonlyInj,
 } from '#imports'
 
 interface Props {
diff --git a/packages/nc-gui/components/cell/Decimal.vue b/packages/nc-gui/components/cell/Decimal.vue
index 9cfba6bb87..79cf2f31e2 100644
--- a/packages/nc-gui/components/cell/Decimal.vue
+++ b/packages/nc-gui/components/cell/Decimal.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import type { VNodeRef } from '@vue/runtime-core'
-import { EditColumnInj, EditModeInj, IsExpandedFormOpenInj, IsFormInj, inject, useVModel, ReadonlyInj } from '#imports'
+import { EditColumnInj, EditModeInj, IsExpandedFormOpenInj, IsFormInj, ReadonlyInj, inject, useVModel } from '#imports'
 
 interface Props {
   // when we set a number, then it is number type
diff --git a/packages/nc-gui/components/cell/Duration.vue b/packages/nc-gui/components/cell/Duration.vue
index f1facc875d..8805b09031 100644
--- a/packages/nc-gui/components/cell/Duration.vue
+++ b/packages/nc-gui/components/cell/Duration.vue
@@ -6,6 +6,7 @@ import {
   EditModeInj,
   IsExpandedFormOpenInj,
   IsFormInj,
+  ReadonlyInj,
   computed,
   convertDurationToSeconds,
   convertMS2Duration,
@@ -13,7 +14,6 @@ import {
   inject,
   parseProp,
   ref,
-  ReadonlyInj,
 } from '#imports'
 
 interface Props {
diff --git a/packages/nc-gui/components/cell/Email.vue b/packages/nc-gui/components/cell/Email.vue
index b6b4b82bed..065557e818 100644
--- a/packages/nc-gui/components/cell/Email.vue
+++ b/packages/nc-gui/components/cell/Email.vue
@@ -6,11 +6,11 @@ import {
   IsExpandedFormOpenInj,
   IsFormInj,
   IsSurveyFormInj,
+  ReadonlyInj,
   computed,
   inject,
   useI18n,
   validateEmail,
-  ReadonlyInj,
 } from '#imports'
 
 interface Props {
diff --git a/packages/nc-gui/components/cell/Integer.vue b/packages/nc-gui/components/cell/Integer.vue
index 4e042280dd..c9867a1073 100644
--- a/packages/nc-gui/components/cell/Integer.vue
+++ b/packages/nc-gui/components/cell/Integer.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { VNodeRef } from '@vue/runtime-core'
-import { EditColumnInj, EditModeInj, IsExpandedFormOpenInj, IsFormInj, inject, useVModel, ReadonlyInj } from '#imports'
+import { EditColumnInj, EditModeInj, IsExpandedFormOpenInj, IsFormInj, ReadonlyInj, inject, useVModel } from '#imports'
 
 interface Props {
   // when we set a number, then it is number type
diff --git a/packages/nc-gui/components/cell/Json.vue b/packages/nc-gui/components/cell/Json.vue
index 56c4fa96e3..f9c54bf3c7 100644
--- a/packages/nc-gui/components/cell/Json.vue
+++ b/packages/nc-gui/components/cell/Json.vue
@@ -3,6 +3,7 @@ import NcModal from '../nc/Modal.vue'
 import {
   ActiveCellInj,
   EditModeInj,
+  IsExpandedFormOpenInj,
   IsFormInj,
   JsonExpandInj,
   ReadonlyInj,
@@ -13,7 +14,6 @@ import {
   useSelectedCellKeyupListener,
   useVModel,
   watch,
-  IsExpandedFormOpenInj,
 } from '#imports'
 
 interface Props {
diff --git a/packages/nc-gui/components/cell/Percent.vue b/packages/nc-gui/components/cell/Percent.vue
index f0218ed5b5..e6487cf711 100644
--- a/packages/nc-gui/components/cell/Percent.vue
+++ b/packages/nc-gui/components/cell/Percent.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { VNodeRef } from '@vue/runtime-core'
-import { EditColumnInj, EditModeInj, IsExpandedFormOpenInj, IsFormInj, inject, useVModel, ReadonlyInj } from '#imports'
+import { EditColumnInj, EditModeInj, IsExpandedFormOpenInj, IsFormInj, ReadonlyInj, inject, useVModel } from '#imports'
 
 interface Props {
   modelValue?: number | string | null
diff --git a/packages/nc-gui/components/cell/Rating.vue b/packages/nc-gui/components/cell/Rating.vue
index d044d3214f..8d4553b081 100644
--- a/packages/nc-gui/components/cell/Rating.vue
+++ b/packages/nc-gui/components/cell/Rating.vue
@@ -3,11 +3,11 @@ import {
   ActiveCellInj,
   ColumnInj,
   IsExpandedFormOpenInj,
+  ReadonlyInj,
   computed,
   inject,
   parseProp,
   useSelectedCellKeyupListener,
-  ReadonlyInj,
 } from '#imports'
 
 interface Props {
diff --git a/packages/nc-gui/components/cell/RichText.vue b/packages/nc-gui/components/cell/RichText.vue
index fa4be15456..45a0ad85b9 100644
--- a/packages/nc-gui/components/cell/RichText.vue
+++ b/packages/nc-gui/components/cell/RichText.vue
@@ -8,7 +8,7 @@ import { generateJSON } from '@tiptap/html'
 import Underline from '@tiptap/extension-underline'
 import { TaskItem } from '@/helpers/dbTiptapExtensions/task-item'
 import { Link } from '@/helpers/dbTiptapExtensions/links'
-import { IsExpandedFormOpenInj, RowHeightInj, ReadonlyInj } from '#imports'
+import { IsExpandedFormOpenInj, ReadonlyInj, RowHeightInj } from '#imports'
 
 const props = defineProps<{
   value?: string | null
diff --git a/packages/nc-gui/components/cell/Url.vue b/packages/nc-gui/components/cell/Url.vue
index a62b4c6eb4..3ec7125fdf 100644
--- a/packages/nc-gui/components/cell/Url.vue
+++ b/packages/nc-gui/components/cell/Url.vue
@@ -8,6 +8,7 @@ import {
   IsExpandedFormOpenInj,
   IsFormInj,
   IsSurveyFormInj,
+  ReadonlyInj,
   computed,
   inject,
   isValidURL,
@@ -17,7 +18,6 @@ import {
   useCellUrlConfig,
   useI18n,
   watch,
-  ReadonlyInj,
 } from '#imports'
 
 interface Props {
diff --git a/packages/nc-gui/components/smartsheet/column/LinkOptions.vue b/packages/nc-gui/components/smartsheet/column/LinkOptions.vue
index cd11d46984..195f36c017 100644
--- a/packages/nc-gui/components/smartsheet/column/LinkOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/LinkOptions.vue
@@ -52,13 +52,21 @@ vModel.value.meta = {
   <a-row class="my-2" gutter="8">
     <a-col :span="12">
       <a-form-item v-bind="validateInfos['meta.singular']" :label="$t('labels.singularLabel')">
-        <a-input v-model:value="vModel.meta.singular" :placeholder="$t('general.link')" class="!w-full nc-link-singular !rounded-md" />
+        <a-input
+          v-model:value="vModel.meta.singular"
+          :placeholder="$t('general.link')"
+          class="!w-full nc-link-singular !rounded-md"
+        />
       </a-form-item>
     </a-col>
 
     <a-col :span="12">
       <a-form-item v-bind="validateInfos['meta.plural']" :label="$t('labels.pluralLabel')">
-        <a-input v-model:value="vModel.meta.plural" :placeholder="$t('general.links')" class="!w-full nc-link-plural !rounded-md" />
+        <a-input
+          v-model:value="vModel.meta.plural"
+          :placeholder="$t('general.links')"
+          class="!w-full nc-link-plural !rounded-md"
+        />
       </a-form-item>
     </a-col>
   </a-row>
diff --git a/packages/nc-gui/components/virtual-cell/BelongsTo.vue b/packages/nc-gui/components/virtual-cell/BelongsTo.vue
index 779267fcd8..9e3e45af01 100644
--- a/packages/nc-gui/components/virtual-cell/BelongsTo.vue
+++ b/packages/nc-gui/components/virtual-cell/BelongsTo.vue
@@ -5,6 +5,7 @@ import {
   ActiveCellInj,
   CellValueInj,
   ColumnInj,
+  IsExpandedFormOpenInj,
   IsFormInj,
   IsUnderLookupInj,
   ReadonlyInj,
@@ -18,7 +19,6 @@ import {
   useRoles,
   useSelectedCellKeyupListener,
   useSmartsheetRowStoreOrThrow,
-  IsExpandedFormOpenInj,
 } from '#imports'
 
 const column = inject(ColumnInj)!
diff --git a/packages/nc-gui/components/virtual-cell/Lookup.vue b/packages/nc-gui/components/virtual-cell/Lookup.vue
index 528901edef..451ec25e07 100644
--- a/packages/nc-gui/components/virtual-cell/Lookup.vue
+++ b/packages/nc-gui/components/virtual-cell/Lookup.vue
@@ -5,6 +5,7 @@ import {
   CellUrlDisableOverlayInj,
   CellValueInj,
   ColumnInj,
+  IsExpandedFormOpenInj,
   IsUnderLookupInj,
   MetaInj,
   computed,
@@ -15,7 +16,6 @@ import {
   useMetas,
   useShowNotEditableWarning,
   watch,
-  IsExpandedFormOpenInj,
 } from '#imports'
 
 const { metas, getMeta } = useMetas()
diff --git a/packages/nc-gui/components/virtual-cell/Rollup.vue b/packages/nc-gui/components/virtual-cell/Rollup.vue
index 34a3a86faf..40b64eac7f 100644
--- a/packages/nc-gui/components/virtual-cell/Rollup.vue
+++ b/packages/nc-gui/components/virtual-cell/Rollup.vue
@@ -3,6 +3,7 @@ import type { ColumnType, LinkToAnotherRecordType, RollupType } from 'nocodb-sdk
 import {
   CellValueInj,
   ColumnInj,
+  IsExpandedFormOpenInj,
   MetaInj,
   computed,
   inject,
@@ -10,7 +11,6 @@ import {
   ref,
   useMetas,
   useShowNotEditableWarning,
-  IsExpandedFormOpenInj,
 } from '#imports'
 
 const { metas } = useMetas()
@@ -54,7 +54,7 @@ const childColumn = computed(() => {
 </script>
 
 <template>
-  <div @dblclick="activateShowEditNonEditableFieldWarning" :class="isExpandedFormOpen ? 'px-2' : 'px-0'">
+  <div :class="isExpandedFormOpen ? 'px-2' : 'px-0'" @dblclick="activateShowEditNonEditableFieldWarning">
     <div v-if="['count', 'avg', 'sum', 'countDistinct', 'sumDistinct', 'avgDistinct'].includes(colOptions.rollup_function)">
       {{ value }}
     </div>
diff --git a/packages/nc-gui/components/virtual-cell/components/ListItem.vue b/packages/nc-gui/components/virtual-cell/components/ListItem.vue
index 8bcaac521b..6cb49e0848 100644
--- a/packages/nc-gui/components/virtual-cell/components/ListItem.vue
+++ b/packages/nc-gui/components/virtual-cell/components/ListItem.vue
@@ -5,6 +5,7 @@ import {
   IsExpandedFormOpenInj,
   IsFormInj,
   IsPublicInj,
+  ReadonlyInj,
   RowHeightInj,
   computed,
   inject,
@@ -13,7 +14,6 @@ import {
   ref,
   useAttachment,
   useVModel,
-  ReadonlyInj,
 } from '#imports'
 import MaximizeIcon from '~icons/nc-icons/maximize'
 import LinkIcon from '~icons/nc-icons/link'