diff --git a/lib/pages/chat.dart b/lib/pages/chat.dart
index c61b6e18..4aee61a8 100644
--- a/lib/pages/chat.dart
+++ b/lib/pages/chat.dart
@@ -99,8 +99,13 @@ class ChatController extends State<Chat> {
       try {
         await timeline.requestHistory(historyCount: _loadHistoryCount);
       } catch (err) {
-        ScaffoldMessenger.of(context).showSnackBar(SnackBar(
-            content: Text((err as Object).toLocalizedString(context))));
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(
+            content: Text(
+              (err as Object).toLocalizedString(context),
+            ),
+          ),
+        );
       }
     }
   }
diff --git a/lib/widgets/event_content/image_bubble.dart b/lib/widgets/event_content/image_bubble.dart
index 0587a951..83df0d38 100644
--- a/lib/widgets/event_content/image_bubble.dart
+++ b/lib/widgets/event_content/image_bubble.dart
@@ -240,6 +240,7 @@ class _ImageBubbleState extends State<ImageBubble> {
           if (!widget.tapToView) return;
           showDialog(
             context: Matrix.of(context).navigatorContext,
+            useRootNavigator: false,
             builder: (_) => ImageViewer(widget.event, onLoaded: () {
               // If the original file didn't load yet, we want to do that now.
               // This is so that the original file displays after going on the image viewer,