--- a/browser/components/places/content/controller.js
+++ b/browser/components/places/content/controller.js
@@ -1668,42 +1668,49 @@ var PlacesControllerDragHelper = {
 
       for (let unwrapped of nodes) {
         let index = await insertionPoint.getIndex();
 
         if (index != -1 && unwrapped.itemGuid) {
           // Note: we use the parent from the existing bookmark as the sidebar
           // gives us an unwrapped.parent that is actually a query and not the real
           // parent.
-          let existingBookmark = await PlacesUtils.bookmarks.fetch(unwrapped.itemGuid);
+          let existingParentGuid = unwrapped.parentGuid;
+          if (!existingParentGuid) {
+            let bookmark = await PlacesUtils.bookmarks.fetch(unwrapped.itemGuid);
+            if (bookmark) {
+              existingParentGuid = bookmark.parentGuid;
+              unwrapped.currentIndex = bookmark.index;
+            }
+          }
 
           // If we're dropping on the same folder, then we may need to adjust
           // the index to insert at the correct place.
-          if (existingBookmark && parentGuid == existingBookmark.parentGuid) {
+          if (parentGuid == existingParentGuid) {
             if (PlacesUIUtils.useAsyncTransactions) {
-              if (index < existingBookmark.index) {
+              if (index < unwrapped.currentIndex) {
                 // When you drag multiple elts upward: need to increment index or
                 // each successive elt will be inserted at the same index, each
                 // above the previous.
                 index += movedCount++;
-              } else if (index > existingBookmark.index) {
+              } else if (index > unwrapped.currentIndex) {
                 // If we're dragging down, we need to go one lower to insert at
                 // the real point as moving the element changes the index of
                 // everything below by 1.
                 index--;
               } else {
                 // This isn't moving so we skip it.
                 continue;
               }
             } else {
               // Sync Transactions. Adjust insertion index to prevent reversal
               // of dragged items. When you drag multiple elts upward: need to
               // increment index or each successive elt will be inserted at the
               // same index, each above the previous.
-              if (index < existingBookmark.index) { // eslint-disable-line no-lonely-if
+              if (index < unwrapped.currentIndex) { // eslint-disable-line no-lonely-if
                 index += movedCount++;
               }
             }
           }
         }
 
         // If dragging over a tag container we should tag the item.
         if (insertionPoint.isTag) {

--- a/browser/components/places/tests/browser/browser_controller_onDrop.js
+++ b/browser/components/places/tests/browser/browser_controller_onDrop.js
@@ -87,16 +87,18 @@ async function run_drag_test(startBookma
       index: insertionIndex,
       orientation: Ci.nsITreeView.DROP_ON
     });
 
     let bookmarkWithId = JSON.stringify(Object.assign({
       id: bookmarkIds.get(dragBookmark.guid),
       itemGuid: dragBookmark.guid,
       parent: PlacesUtils.unfiledBookmarksFolderId,
+      parentGuid: dragBookmark.parentGuid,
+      currentIndex: dragBookmark.index
     }, dragBookmark));
 
     let dt = {
       dropEffect: "move",
       mozCursor: "auto",
       mozItemCount: 1,
       types: [ PlacesUtils.TYPE_X_MOZ_PLACE ],
       mozTypesAt(i) {

--- a/toolkit/components/places/PlacesUtils.jsm
+++ b/toolkit/components/places/PlacesUtils.jsm
@@ -133,22 +133,26 @@ function serializeNode(aNode, aIsLivemar
   let data = {};
 
   data.title = aNode.title;
   data.id = aNode.itemId;
   data.livemark = aIsLivemark;
   // Add an instanceId so we can tell which instance of an FF session the data
   // is coming from.
   data.instanceId = PlacesUtils.instanceId;
+  // Add a currentIndex reference to speed up drops & pastes.
+  data.currentIndex = aNode.bookmarkIndex;
 
   let guid = aNode.bookmarkGuid;
   if (guid) {
     data.itemGuid = guid;
-    if (aNode.parent)
+    if (aNode.parent) {
       data.parent = aNode.parent.itemId;
+      data.parentGuid = PlacesUtils.getConcreteItemGuid(aNode.parent);
+    }
     let grandParent = aNode.parent && aNode.parent.parent;
     if (grandParent)
       data.grandParentId = grandParent.itemId;
 
     data.dateAdded = aNode.dateAdded;
     data.lastModified = aNode.lastModified;
 
     let annos = PlacesUtils.getAnnotationsForItem(data.id);