diff --git a/app/src/main/java/org/mozilla/fenix/library/history/HistoryUIView.kt b/app/src/main/java/org/mozilla/fenix/library/history/HistoryUIView.kt
index dcf4fbfeb..0f818200a 100644
--- a/app/src/main/java/org/mozilla/fenix/library/history/HistoryUIView.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/history/HistoryUIView.kt
@@ -109,7 +109,13 @@ private class HistoryAdapter(
 
             if (mode is HistoryState.Mode.Editing) {
                 checkbox.setOnCheckedChangeListener(null)
-                checkbox.isChecked = mode.selectedItems.contains(item)
+
+                // Don't set the checkbox if it already contains the right value.
+                // This prevent us from cutting off the animation
+                val shouldCheck = mode.selectedItems.contains(item)
+                if (checkbox.isChecked != shouldCheck) {
+                    checkbox.isChecked = mode.selectedItems.contains(item)
+                }
                 checkbox.setOnCheckedChangeListener(checkListener)
             }
         }
diff --git a/app/src/main/res/layout/component_history.xml b/app/src/main/res/layout/component_history.xml
index fb88d5452..dc970adc2 100644
--- a/app/src/main/res/layout/component_history.xml
+++ b/app/src/main/res/layout/component_history.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <androidx.recyclerview.widget.RecyclerView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/history_list"