diff --git a/app/src/amazon/java/org/tasks/injection/ActivityComponent.java b/app/src/amazon/java/org/tasks/injection/ActivityComponent.java
index 33ef9347b..5422257a0 100644
--- a/app/src/amazon/java/org/tasks/injection/ActivityComponent.java
+++ b/app/src/amazon/java/org/tasks/injection/ActivityComponent.java
@@ -35,6 +35,7 @@ import org.tasks.reminders.MissedCallActivity;
 import org.tasks.reminders.NotificationActivity;
 import org.tasks.reminders.SnoozeActivity;
 import org.tasks.themes.Theme;
+import org.tasks.ui.TaskListViewModel;
 import org.tasks.voice.VoiceCommandActivity;
 import org.tasks.widget.ShortcutConfigActivity;
 import org.tasks.widget.WidgetConfigActivity;
@@ -123,4 +124,6 @@ public interface ActivityComponent {
     void inject(GoogleTaskListSettingsActivity googleTaskListSettingsActivity);
 
     void inject(TaskerCreateTaskActivity taskerCreateTaskActivity);
+
+    void inject(TaskListViewModel viewModel);
 }
diff --git a/app/src/generic/java/org/tasks/injection/ActivityComponent.java b/app/src/generic/java/org/tasks/injection/ActivityComponent.java
index 33ef9347b..5422257a0 100644
--- a/app/src/generic/java/org/tasks/injection/ActivityComponent.java
+++ b/app/src/generic/java/org/tasks/injection/ActivityComponent.java
@@ -35,6 +35,7 @@ import org.tasks.reminders.MissedCallActivity;
 import org.tasks.reminders.NotificationActivity;
 import org.tasks.reminders.SnoozeActivity;
 import org.tasks.themes.Theme;
+import org.tasks.ui.TaskListViewModel;
 import org.tasks.voice.VoiceCommandActivity;
 import org.tasks.widget.ShortcutConfigActivity;
 import org.tasks.widget.WidgetConfigActivity;
@@ -123,4 +124,6 @@ public interface ActivityComponent {
     void inject(GoogleTaskListSettingsActivity googleTaskListSettingsActivity);
 
     void inject(TaskerCreateTaskActivity taskerCreateTaskActivity);
+
+    void inject(TaskListViewModel viewModel);
 }
diff --git a/app/src/main/java/org/tasks/tasklist/TaskListRecyclerAdapter.java b/app/src/main/java/org/tasks/tasklist/TaskListRecyclerAdapter.java
index a0a190836..90b46926d 100644
--- a/app/src/main/java/org/tasks/tasklist/TaskListRecyclerAdapter.java
+++ b/app/src/main/java/org/tasks/tasklist/TaskListRecyclerAdapter.java
@@ -235,7 +235,9 @@ public class TaskListRecyclerAdapter extends RecyclerView.Adapter<ViewHolder>
         public void onDestroyActionMode(ActionMode actionMode) {
             adapter.clearSelections();
             TaskListRecyclerAdapter.this.mode = null;
-            notifyDataSetChanged();
+            if (!dragging) {
+                notifyDataSetChanged();
+            }
         }
     };
 
@@ -323,6 +325,7 @@ public class TaskListRecyclerAdapter extends RecyclerView.Adapter<ViewHolder>
             int fromPosition = source.getAdapterPosition();
             int toPosition = target.getAdapterPosition();
             if (from == -1) {
+                ((ViewHolder) source).setSelected(false);
                 from = fromPosition;
             }
             to = toPosition;