diff --git a/lib/ui/file_info_dialog.dart b/lib/ui/file_info_dialog.dart
index 759f0749b..656401827 100644
--- a/lib/ui/file_info_dialog.dart
+++ b/lib/ui/file_info_dialog.dart
@@ -182,9 +182,12 @@ class _FileInfoWidgetState extends State<FileInfoWidget> {
         child: Row(
           mainAxisAlignment: MainAxisAlignment.spaceBetween,
           children: [
-            Text(
-              file.getDisplayName(),
+            Flexible(
+              child: Text(
+                file.getDisplayName(),
+              ),
             ),
+            Padding(padding: EdgeInsets.all(8)),
             Icon(
               Icons.edit,
               color: Colors.white.withOpacity(0.85),
diff --git a/lib/ui/sessions_page.dart b/lib/ui/sessions_page.dart
index df247547c..1d2370e46 100644
--- a/lib/ui/sessions_page.dart
+++ b/lib/ui/sessions_page.dart
@@ -67,18 +67,23 @@ class _SessionsPageState extends State<SessionsPage> {
                 Row(
                   mainAxisAlignment: MainAxisAlignment.spaceBetween,
                   children: [
-                    Text(
-                      session.ip,
-                      style: TextStyle(
-                        color: Colors.white.withOpacity(0.8),
-                        fontSize: 14,
+                    Flexible(
+                      child: Text(
+                        session.ip,
+                        style: TextStyle(
+                          color: Colors.white.withOpacity(0.8),
+                          fontSize: 14,
+                        ),
                       ),
                     ),
-                    Text(
-                      getFormattedTime(lastUsedTime),
-                      style: TextStyle(
-                        color: Colors.white.withOpacity(0.8),
-                        fontSize: 12,
+                    Padding(padding: EdgeInsets.all(8)),
+                    Flexible(
+                      child: Text(
+                        getFormattedTime(lastUsedTime),
+                        style: TextStyle(
+                          color: Colors.white.withOpacity(0.8),
+                          fontSize: 12,
+                        ),
                       ),
                     ),
                   ],