diff --git a/apps/student/src/main/java/com/instructure/student/features/files/list/FileListFragment.kt b/apps/student/src/main/java/com/instructure/student/features/files/list/FileListFragment.kt
index c6fd5a2a59..89657b7fb6 100644
--- a/apps/student/src/main/java/com/instructure/student/features/files/list/FileListFragment.kt
+++ b/apps/student/src/main/java/com/instructure/student/features/files/list/FileListFragment.kt
@@ -600,7 +600,7 @@ class FileListFragment : ParentFragment(), Bookmarkable, FileUploadDialogParent
     }
 
     override val bookmark: Bookmarker
-        get() = Bookmarker(canvasContext.isCourseOrGroup, canvasContext)
+        get() = Bookmarker(canvasContext.isCourseOrGroup && folder?.isRoot == true, canvasContext)
 
     private fun animateFabs() = with(binding) {
         if (mFabOpen) {
diff --git a/apps/student/src/main/java/com/instructure/student/router/RouteMatcher.kt b/apps/student/src/main/java/com/instructure/student/router/RouteMatcher.kt
index ab904846d4..4f729a4718 100644
--- a/apps/student/src/main/java/com/instructure/student/router/RouteMatcher.kt
+++ b/apps/student/src/main/java/com/instructure/student/router/RouteMatcher.kt
@@ -403,6 +403,13 @@ object RouteMatcher : BaseRouteMatcher() {
                 AssignmentDetailsFragment::class.java
             )
         )
+        routes.add(
+            Route(
+                courseOrGroup("/:${RouterParams.COURSE_ID}/assignments/:${RouterParams.ASSIGNMENT_ID}"),
+                QuizListFragment::class.java,
+                AssignmentDetailsFragment::class.java
+            )
+        ) // Route for new quizzes opened from the quiz list. New quizzes are shown on the Assignment details. This is needed for the bookmarker to find the correct route.
 
         // Studio
         routes.add(