diff --git a/lib/screens/form_screen.dart b/lib/screens/form_screen.dart
index d2505b67..74b31798 100644
--- a/lib/screens/form_screen.dart
+++ b/lib/screens/form_screen.dart
@@ -17,6 +17,7 @@
  */
 
 import 'package:flutter/material.dart';
+import 'package:flutter/rendering.dart';
 import 'package:wger/theme/theme.dart';
 
 /// Arguments passed to the form screen
@@ -59,9 +60,11 @@ class FormScreen extends StatelessWidget {
       backgroundColor: args.backgroundColor,
       appBar: AppBar(title: Text(args.title)),
       body: args.hasListView
-          ? Padding(
-              padding: args.padding,
-              child: args.widget,
+          ? Scrollable(
+              viewportBuilder: (BuildContext context, ViewportOffset position) => Padding(
+                padding: args.padding,
+                child: args.widget,
+              ),
             )
           : Column(
               mainAxisSize: MainAxisSize.max,
diff --git a/test/nutrition/nutritional_meal_item_form_test.dart b/test/nutrition/nutritional_meal_item_form_test.dart
index fede91a9..2267b398 100644
--- a/test/nutrition/nutritional_meal_item_form_test.dart
+++ b/test/nutrition/nutritional_meal_item_form_test.dart
@@ -1,6 +1,7 @@
 import 'dart:convert';
 
 import 'package:flutter/material.dart';
+import 'package:flutter/rendering.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_typeahead/flutter_typeahead.dart';
@@ -84,7 +85,10 @@ void main() {
         supportedLocales: AppLocalizations.supportedLocales,
         navigatorKey: key,
         home: Scaffold(
-          body: MealItemForm(meal, const [], null, code, test),
+          body: Scrollable(
+            viewportBuilder: (BuildContext context, ViewportOffset position) =>
+                MealItemForm(meal, const [], null, code, test),
+          ),
         ),
         routes: {
           NutritionalPlanScreen.routeName: (ctx) => NutritionalPlanScreen(),