diff --git a/lib/ui/exif_info_dialog.dart b/lib/ui/exif_info_dialog.dart
index 65cc5998c..cd08d36b6 100644
--- a/lib/ui/exif_info_dialog.dart
+++ b/lib/ui/exif_info_dialog.dart
@@ -68,7 +68,7 @@ class _ExifInfoDialogState extends State<ExifInfoDialog> {
                   data,
                   style: TextStyle(
                     fontSize: 14,
-                    fontFeatures: [
+                    fontFeatures: const [
                       FontFeature.tabularFigures(),
                     ],
                     height: 1.4,
diff --git a/lib/ui/file_info_dialog.dart b/lib/ui/file_info_dialog.dart
index 359a44407..4ea2b3529 100644
--- a/lib/ui/file_info_dialog.dart
+++ b/lib/ui/file_info_dialog.dart
@@ -351,12 +351,15 @@ class _FileInfoWidgetState extends State<FileInfoWidget> {
                 color: Colors.white.withOpacity(0.85),
               ),
               Padding(padding: EdgeInsets.all(4)),
-              Text(
-                exif["Image Make"].toString() +
-                    " " +
-                    exif["Image Model"].toString(),
-                style: TextStyle(
-                  color: Colors.white.withOpacity(0.85),
+              Flexible(
+                child: Text(
+                  exif["Image Make"].toString() +
+                      " " +
+                      exif["Image Model"].toString(),
+                  style: TextStyle(
+                    color: Colors.white.withOpacity(0.85),
+                  ),
+                  overflow: TextOverflow.clip,
                 ),
               ),
             ],