diff --git a/Core/Core/Grades/View/GradeListView.swift b/Core/Core/Grades/View/GradeListView.swift
index f45438e243..ff9d2d56db 100644
--- a/Core/Core/Grades/View/GradeListView.swift
+++ b/Core/Core/Grades/View/GradeListView.swift
@@ -112,6 +112,7 @@ public struct GradeListView: View, ScreenViewTrackable {
                                  : .textLightest)
 
         }
+        .hidden(viewModel.state == .initialLoading)
         .accessibilityLabel(Text("Filter", bundle: .core))
         .accessibilityHint(Text("Filter grades options", bundle: .core))
         .accessibilityIdentifier("GradeList.filterButton")
diff --git a/Student/StudentE2ETests/Grades/GradingPeriodsTests.swift b/Student/StudentE2ETests/Grades/GradingPeriodsTests.swift
index add83048f5..62f4b0569b 100644
--- a/Student/StudentE2ETests/Grades/GradingPeriodsTests.swift
+++ b/Student/StudentE2ETests/Grades/GradingPeriodsTests.swift
@@ -22,7 +22,6 @@ class GradingPeriodsTests: E2ETestCase {
     typealias Helper = GradesHelper
 
     func testGradingPeriodsFilter() throws {
-        try XCTSkipIf(true, "Skipped because of MBL-18023.")
         // MARK: Seed the usual stuff with grading periods containing graded assignments
         let student = seeder.createUser()
         let enrollmentTerm = Helper.createEnrollmentTerm()