diff --git a/lib/config/themes.dart b/lib/config/themes.dart
index 4fcff7b758..3a4a783ba3 100644
--- a/lib/config/themes.dart
+++ b/lib/config/themes.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
@@ -72,6 +73,10 @@ abstract class FluffyThemes {
       useMaterial3: true,
       brightness: brightness,
       colorScheme: colorScheme,
+      cupertinoOverrideTheme: const CupertinoThemeData(
+        // This is required by adaptive_dialog
+        textTheme: CupertinoTextThemeData(),
+      ),
       textTheme: PlatformInfos.isDesktop
           ? brightness == Brightness.light
               ? Typography.material2018().black.merge(fallbackTextTheme)
diff --git a/lib/pages/chat/input_bar.dart b/lib/pages/chat/input_bar.dart
index 1e1f3f40ec..1e0c84026d 100644
--- a/lib/pages/chat/input_bar.dart
+++ b/lib/pages/chat/input_bar.dart
@@ -461,6 +461,10 @@ class InputBar extends StatelessWidget {
                 final data = content.data;
                 if (data == null) return;
 
+                if (content.mimeType.startsWith("image/")) {
+                  onSubmitImage!(data);
+                  return;
+                }
                 final file = MatrixFile(
                   mimeType: content.mimeType,
                   bytes: data,