diff --git a/packages/builder/src/database/ModelDataTable/modals/CreateEditRecord.svelte b/packages/builder/src/database/ModelDataTable/modals/CreateEditRecord.svelte
index c7ac755825..7d00256f3c 100644
--- a/packages/builder/src/database/ModelDataTable/modals/CreateEditRecord.svelte
+++ b/packages/builder/src/database/ModelDataTable/modals/CreateEditRecord.svelte
@@ -31,12 +31,14 @@
     ? selectedModel.fields.map(({ name }) => name)
     : []
 
-  $: currentCollectionKey = 
-    $store.selectedRecord
-    ? joinKey($store.selectedRecord.key, selectedModel.collectionName)
+  
+  function getCurrentCollectionKey(selectedRecord) {
+    return selectedRecord
+    ? joinKey(selectedRecord.key, selectedModel.collectionName)
     : joinKey(selectedModel.collectionName)
+  }
 
-  $: editingRecord = editingRecord || record || getNewRecord(selectedModel, currentCollectionKey)
+  $: editingRecord = editingRecord || record || getNewRecord(selectedModel, getCurrentCollectionKey($backendUiStore.selectedRecord))
 
   function closed() {
     editingRecord = null