diff --git a/lib/pages_desktop_specific/settings/settings_menu/advanced_settings/advanced_settings.dart b/lib/pages_desktop_specific/settings/settings_menu/advanced_settings/advanced_settings.dart
index 435d162ac..102a547d6 100644
--- a/lib/pages_desktop_specific/settings/settings_menu/advanced_settings/advanced_settings.dart
+++ b/lib/pages_desktop_specific/settings/settings_menu/advanced_settings/advanced_settings.dart
@@ -321,9 +321,7 @@ class _AdvancedSettings extends ConsumerState<AdvancedSettings> {
                               useSafeArea: false,
                               barrierDismissible: true,
                               builder: (context) {
-                                return const SingleChildScrollView(
-                                  child: DebugInfoDialog(),
-                                );
+                                return const DebugInfoDialog();
                               },
                             );
                           },
diff --git a/lib/pages_desktop_specific/settings/settings_menu/advanced_settings/debug_info_dialog.dart b/lib/pages_desktop_specific/settings/settings_menu/advanced_settings/debug_info_dialog.dart
index 0ae221621..c9a476d04 100644
--- a/lib/pages_desktop_specific/settings/settings_menu/advanced_settings/debug_info_dialog.dart
+++ b/lib/pages_desktop_specific/settings/settings_menu/advanced_settings/debug_info_dialog.dart
@@ -98,7 +98,10 @@ class _DebugInfoDialog extends ConsumerState<DebugInfoDialog> {
   @override
   Widget build(BuildContext context) {
     return DesktopDialog(
-      maxHeight: 850,
+      // Max height of 850 unless the screen is smaller than that.
+      maxHeight: MediaQuery.of(context).size.height < 850
+          ? MediaQuery.of(context).size.height
+          : 850,
       maxWidth: 600,
       child: Column(
         children: [