diff --git a/lib/ui/dashboard/widgets/grades_card.dart b/lib/ui/dashboard/widgets/grades_card.dart
index b2fa887f0..b09089824 100644
--- a/lib/ui/dashboard/widgets/grades_card.dart
+++ b/lib/ui/dashboard/widgets/grades_card.dart
@@ -37,24 +37,25 @@ class GradesCard extends StatelessWidget {
 
     return TitledCard(
       title: AppIntl.of(context)!.grades_title,
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        mainAxisSize: MainAxisSize.min,
-        children: [
-          if (courses.isEmpty && !loading)
-            _buildNoGradesContent(context)
-          else
-            _buildGradesButton(courses, context, loading: loading),
-        ],
-      ),
+      child: (courses.isEmpty && !loading)
+          ? _buildNoGradesContent(context)
+          : _buildGradesButton(courses, context, loading: loading),
     );
   }
 
-  static Widget _buildGradesButton(List<Course> courses, BuildContext context, {bool loading = false}) => Skeletonizer(
+  static Widget _buildGradesButton(
+    List<Course> courses,
+    BuildContext context, {
+    bool loading = false,
+    Axis direction = Axis.horizontal,
+  }) => Skeletonizer(
     enabled: loading,
-    child: Container(
+    child: SingleChildScrollView(
+      scrollDirection: direction,
       padding: const EdgeInsets.fromLTRB(17, 10, 15, 10),
-      child: Wrap(
+      child: Flex(
+        direction: direction,
+        spacing: 10,
         children: courses.map((course) => GradeButton(course, color: context.theme.appColors.backgroundAlt)).toList(),
       ),
     ),