diff --git a/app/src/main/java/org/tasks/preferences/beast/BeastModeRecyclerAdapter.java b/app/src/main/java/org/tasks/preferences/beast/BeastModeRecyclerAdapter.java
index d09af5a62..4f038e577 100644
--- a/app/src/main/java/org/tasks/preferences/beast/BeastModeRecyclerAdapter.java
+++ b/app/src/main/java/org/tasks/preferences/beast/BeastModeRecyclerAdapter.java
@@ -86,8 +86,8 @@ public class BeastModeRecyclerAdapter extends RecyclerView.Adapter<BeastModeView
     @Override
     public boolean onMove(
         RecyclerView recyclerView, RecyclerView.ViewHolder from, RecyclerView.ViewHolder to) {
-      int fromPosition = from.getAdapterPosition();
-      int toPosition = to.getAdapterPosition();
+      int fromPosition = from.getBindingAdapterPosition();
+      int toPosition = to.getBindingAdapterPosition();
       Collections.swap(items, fromPosition, toPosition);
       notifyItemMoved(fromPosition, toPosition);
       return true;
diff --git a/app/src/main/java/org/tasks/tasklist/DragAndDropRecyclerAdapter.kt b/app/src/main/java/org/tasks/tasklist/DragAndDropRecyclerAdapter.kt
index ea6293faf..5b959e285 100644
--- a/app/src/main/java/org/tasks/tasklist/DragAndDropRecyclerAdapter.kt
+++ b/app/src/main/java/org/tasks/tasklist/DragAndDropRecyclerAdapter.kt
@@ -129,7 +129,7 @@ class DragAndDropRecyclerAdapter(
                 taskList.startActionMode()
                 (viewHolder as TaskViewHolder?)!!.moving = true
                 dragging = true
-                val position = viewHolder!!.adapterPosition
+                val position = viewHolder!!.bindingAdapterPosition
                 updateIndents(viewHolder as TaskViewHolder?, position, position)
             }
         }
@@ -137,19 +137,19 @@ class DragAndDropRecyclerAdapter(
         override fun getMovementFlags(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder): Int {
             return when {
                 !dragAndDropEnabled() -> NO_MOVEMENT
-                adapter.isHeader(viewHolder.adapterPosition) -> NO_MOVEMENT
+                adapter.isHeader(viewHolder.bindingAdapterPosition) -> NO_MOVEMENT
                 adapter.numSelected > 0 -> NO_MOVEMENT
                 else -> ALLOW_DRAGGING
             }
-        }
+        }  
 
         override fun onMove(
                 recyclerView: RecyclerView,
                 src: RecyclerView.ViewHolder,
                 target: RecyclerView.ViewHolder): Boolean {
             taskList.finishActionMode()
-            val fromPosition = src.adapterPosition
-            val toPosition = target.adapterPosition
+            val fromPosition = src.bindingAdapterPosition
+            val toPosition = target.bindingAdapterPosition
             val source = src as TaskViewHolder
             val isHeader = isHeader(toPosition)
             if (!isHeader && !adapter.canMove(source.task, fromPosition, (target as TaskViewHolder).task, toPosition)) {
@@ -235,7 +235,7 @@ class DragAndDropRecyclerAdapter(
                     vh.indent = targetIndent
                     moved(from, to, targetIndent)
                 } else if (task.indent != targetIndent) {
-                    val position = vh.adapterPosition
+                    val position = vh.bindingAdapterPosition
                     vh.task.indent = targetIndent
                     vh.task.targetIndent = targetIndent
                     vh.indent = targetIndent
diff --git a/app/src/main/java/org/tasks/tasklist/TaskListRecyclerAdapter.kt b/app/src/main/java/org/tasks/tasklist/TaskListRecyclerAdapter.kt
index 35847a428..c31740632 100644
--- a/app/src/main/java/org/tasks/tasklist/TaskListRecyclerAdapter.kt
+++ b/app/src/main/java/org/tasks/tasklist/TaskListRecyclerAdapter.kt
@@ -40,7 +40,7 @@ abstract class TaskListRecyclerAdapter internal constructor(
 
     fun toggle(taskViewHolder: TaskViewHolder) {
         adapter.toggleSelection(taskViewHolder.task)
-        notifyItemChanged(taskViewHolder.adapterPosition)
+        notifyItemChanged(taskViewHolder.bindingAdapterPosition)
         if (adapter.getSelected().isEmpty()) {
             taskList.finishActionMode()
         } else {