diff --git a/css/index.css b/css/index.css
index 0ba5dc24..344a6553 100644
--- a/css/index.css
+++ b/css/index.css
@@ -223,11 +223,6 @@ html {
   }
 }
 
-.bk-field-list {
-  position: relative;
-  min-height: 30px;
-}
-
 .bk .bk-blokkli-item-label {
   @apply flex items-center text-mono-700 text-left;
   > div {
diff --git a/src/runtime/components/BlokkliField.vue b/src/runtime/components/BlokkliField.vue
index 40b4a0a0..3e20bf9b 100644
--- a/src/runtime/components/BlokkliField.vue
+++ b/src/runtime/components/BlokkliField.vue
@@ -29,7 +29,6 @@
     :class="[
       attrs.class,
       {
-        'bk-field-list': canEdit && !isNested && !isPreview,
         [nonEmptyClass]: filteredList.length,
       },
       listClass,
diff --git a/src/runtime/components/Edit/DraggableList.vue b/src/runtime/components/Edit/DraggableList.vue
index 3091bf39..f05f8e4a 100644
--- a/src/runtime/components/Edit/DraggableList.vue
+++ b/src/runtime/components/Edit/DraggableList.vue
@@ -12,7 +12,7 @@
   >
     <div
       ref="root"
-      class="bk-field-list-proxy-list bk-draggable-list-container bk-field-list"
+      class="bk-field-list-proxy-list bk-draggable-list-container"
       v-bind="fieldAttributes"
     >
       <BlokkliItem
diff --git a/src/runtime/helpers/domProvider.ts b/src/runtime/helpers/domProvider.ts
index 110907a3..0afab4bc 100644
--- a/src/runtime/helpers/domProvider.ts
+++ b/src/runtime/helpers/domProvider.ts
@@ -89,8 +89,6 @@ export type DomProvider = {
     el: Element | EventTarget,
   ): DraggableExistingBlock | undefined
 
-  getAllFields(): BlokkliFieldElement[]
-
   /**
    * Return the droppable markup for a draggable item.
    */
@@ -429,18 +427,6 @@ export default function (ui: UiProvider, debug: DebugProvider): DomProvider {
       .filter(falsy)
   }
 
-  const getAllFields = (): BlokkliFieldElement[] => {
-    const elements = [...document.querySelectorAll('.bk-field-list')]
-
-    return elements
-      .map((element) => {
-        if (element instanceof HTMLElement) {
-          return buildFieldElement(element)
-        }
-      })
-      .filter(falsy)
-  }
-
   const getDropElementMarkup = (
     item: DraggableItem,
     checkSize?: boolean,
@@ -466,7 +452,7 @@ export default function (ui: UiProvider, debug: DebugProvider): DomProvider {
     if (!block) {
       throw new Error('Block does not exist: ' + uuid)
     }
-    const el = block.element().closest('.bk-field-list')
+    const el = block.element().closest('.bk-draggable-list-container')
     if (!(el instanceof HTMLElement)) {
       throw new TypeError('Failed to locate field element for block: ' + uuid)
     }
@@ -701,7 +687,6 @@ export default function (ui: UiProvider, debug: DebugProvider): DomProvider {
     findBlock,
     getAllBlocks,
     findClosestBlock,
-    getAllFields,
     getDropElementMarkup,
     getBlockField,
     findField,