diff --git a/app/assets/stylesheets/bubbles.css b/app/assets/stylesheets/bubbles.css
index fcd1e2420..0440a40d7 100644
--- a/app/assets/stylesheets/bubbles.css
+++ b/app/assets/stylesheets/bubbles.css
@@ -366,18 +366,24 @@
     text-decoration: none;
   }
 
-  li {
-    border-radius: 0.6em;
-    list-style: none;
-    padding: 0.5em var(--inline-space);
-    position: relative;
-    transition: background-color 200ms ease-out;
+  ul {
+    li {
+      border-radius: 0.6em;
+      list-style: none;
+      padding: 0.5em var(--inline-space);
+      position: relative;
+      transition: background-color 200ms ease-out;
+    }
 
-    @media (hover: hover) {
-      &:hover {
-        background-color: color(from var(--bubble-color) srgb r g b / 0.15);
-        border: 0;
-        border-radius: 0.6em;
+    &:not(.dragging) {
+      li {
+        @media (hover: hover) {
+          &:hover {
+            background-color: color(from var(--bubble-color) srgb r g b / 0.15);
+            border: 0;
+            border-radius: 0.6em;
+          }
+        }
       }
     }
   }
diff --git a/app/javascript/controllers/divider_controller.js b/app/javascript/controllers/divider_controller.js
index 847563d8f..058bcb6a0 100644
--- a/app/javascript/controllers/divider_controller.js
+++ b/app/javascript/controllers/divider_controller.js
@@ -2,10 +2,11 @@ import { Controller } from "@hotwired/stimulus"
 
 const MOVE_ITEM_DATA_TYPE = "x-fizzy/move"
 const DIVIDER_ITEM_NODE_NAME = "LI"
+const OVERLAP_THRESHOLD = 0.25
 
 export default class extends Controller {
   static targets = [ "divider", "dragImage", "count" ]
-  static classes = [ "installed" ]
+  static classes = [ "installed", "dragging" ]
   static values = { startCount: Number, maxCount: Number }
 
   connect() {
@@ -22,6 +23,7 @@ export default class extends Controller {
       event.dataTransfer.dropEffect = "move"
       event.dataTransfer.setData(MOVE_ITEM_DATA_TYPE, event.target)
       event.dataTransfer.setDragImage(this.dragImageTarget, 0, 0)
+      this.element.classList.add(this.draggingClass)
     }
   }
 
@@ -31,14 +33,22 @@ export default class extends Controller {
     }
   }
 
-  moveDivider({ target }) {
-    if (target.nodeName == DIVIDER_ITEM_NODE_NAME) {
-      this.#moveDividerTo(this.#items.indexOf(target))
+  moveDivider(event) {
+    if (event.target.nodeName == DIVIDER_ITEM_NODE_NAME) {
+      const rect = this.dividerTarget.getBoundingClientRect()
+      const distanceToTop = Math.abs(event.clientY - rect.top)
+      const distanceToBottom = Math.abs(event.clientY - (rect.top + rect.height))
+      const distanceToNearestEdge = Math.min(distanceToTop, distanceToBottom)
+      const overlap = distanceToNearestEdge / rect.height
+
+      if (overlap > OVERLAP_THRESHOLD) {
+        this.#moveDividerTo(this.#items.indexOf(event.target))
+      }
     }
   }
 
-  persist() {
-    // TODO
+  drop() {
+    this.element.classList.remove(this.draggingClass)
   }
 
   #moveDividerTo(index) {
diff --git a/app/views/bubbles/index.html.erb b/app/views/bubbles/index.html.erb
index f7255893a..5dff555d4 100644
--- a/app/views/bubbles/index.html.erb
+++ b/app/views/bubbles/index.html.erb
@@ -39,7 +39,8 @@
       data-divider-start-count-value="10"
       data-divider-max-count-value="10"
       data-divider-installed-class="bubbles-list__divider--installed"
-      data-action="turbo:morph@document->divider#install dragstart->divider#configureDrag dragenter->divider#acceptDrop dragover->divider#acceptDrop dragover->divider#moveDivider drop->divider#persist">
+      data-divider-dragging-class="dragging"
+      data-action="turbo:morph@document->divider#install dragstart->divider#configureDrag dragenter->divider#acceptDrop dragover->divider#acceptDrop dragover->divider#moveDivider drop->divider#drop">
     <%= render partial: "bubbles/list/bubble", collection: @bubbles, cached: true %>
     <%= render "bubbles/list/divider", filter: @filter %>
   </ul>