diff --git a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkDeselectNavigationListener.kt b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkDeselectNavigationListener.kt
index 7582604468..be3c90d1d5 100644
--- a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkDeselectNavigationListener.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkDeselectNavigationListener.kt
@@ -33,6 +33,7 @@ class BookmarkDeselectNavigationListener(
      */
     override fun onDestinationChanged(controller: NavController, destination: NavDestination, arguments: Bundle?) {
         if (destination.id != R.id.bookmarkFragment || differentFromSelectedFolder(arguments)) {
+            // TODO this is currently called when opening the bookmark menu. Fix this if possible
             bookmarkInteractor.onAllBookmarksDeselected()
         }
     }
diff --git a/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkFragmentStoreTest.kt b/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkFragmentStoreTest.kt
index 6dacb11b85..4d7eaf67c4 100644
--- a/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkFragmentStoreTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkFragmentStoreTest.kt
@@ -25,7 +25,8 @@ class BookmarkFragmentStoreTest {
 
         store.dispatch(BookmarkFragmentAction.Change(tree)).join()
 
-        assertThat(initialState.copy(tree = tree)).isEqualTo(store.state)
+        assertThat(tree).isEqualTo(store.state.tree)
+        assertThat(initialState.mode).isEqualTo(store.state.mode)
     }
 
     @Test
@@ -37,7 +38,8 @@ class BookmarkFragmentStoreTest {
 
         store.dispatch(BookmarkFragmentAction.Change(newTree)).join()
 
-        assertThat(initialState.copy(tree = newTree)).isEqualTo(store.state)
+        assertThat(newTree).isEqualTo(store.state.tree)
+        assertThat(initialState.mode).isEqualTo(store.state.mode)
     }
 
     @Test
@@ -49,7 +51,8 @@ class BookmarkFragmentStoreTest {
 
         store.dispatch(BookmarkFragmentAction.Change(tree)).join()
 
-        assertSame(initialState, store.state)
+        assertThat(initialState.tree).isEqualTo(store.state.tree)
+        assertThat(initialState.mode).isEqualTo(store.state.mode)
     }
 
     @Test
@@ -59,7 +62,8 @@ class BookmarkFragmentStoreTest {
 
         store.dispatch(BookmarkFragmentAction.Change(newTree)).join()
 
-        assertThat(BookmarkFragmentState(newTree, BookmarkFragmentState.Mode.Selecting(setOf(subfolder)))).isEqualTo(store.state)
+        assertThat(newTree).isEqualTo(store.state.tree)
+        assertThat(BookmarkFragmentState.Mode.Selecting(setOf(subfolder))).isEqualTo(store.state.mode)
     }
 
     @Test
@@ -133,7 +137,10 @@ class BookmarkFragmentStoreTest {
 
         store.dispatch(BookmarkFragmentAction.Change(newTree)).join()
 
-        assertThat(initialState.copy(tree = newTree, mode = BookmarkFragmentState.Mode.Normal)).isEqualTo(store.state)
+        store.state.run {
+            assertThat(newTree).isEqualTo(tree)
+            assertThat(BookmarkFragmentState.Mode.Normal).isEqualTo(mode)
+        }
     }
 
     @Test