diff --git a/lib/model/binding.dart b/lib/model/binding.dart
index 1e2e3ae0469..1995677e034 100644
--- a/lib/model/binding.dart
+++ b/lib/model/binding.dart
@@ -14,6 +14,8 @@ import '../log.dart';
 import '../widgets/store.dart';
 import 'store.dart';
 
+export 'package:file_picker/file_picker.dart' show FilePickerResult, FileType, PlatformFile;
+
 /// Alias for [url_launcher.LaunchMode].
 typedef UrlLaunchMode = url_launcher.LaunchMode;
 
diff --git a/lib/widgets/compose_box.dart b/lib/widgets/compose_box.dart
index 35c54936bd0..3c1a2a52963 100644
--- a/lib/widgets/compose_box.dart
+++ b/lib/widgets/compose_box.dart
@@ -1,5 +1,4 @@
 import 'package:app_settings/app_settings.dart';
-import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_gen/gen_l10n/zulip_localizations.dart';
diff --git a/test/model/binding.dart b/test/model/binding.dart
index 3e9e93412d4..79dc38ea152 100644
--- a/test/model/binding.dart
+++ b/test/model/binding.dart
@@ -1,7 +1,6 @@
 import 'dart:async';
 
 import 'package:cross_file/cross_file.dart';
-import 'package:file_picker/file_picker.dart' as file_picker;
 import 'package:firebase_core/firebase_core.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/foundation.dart';
@@ -294,7 +293,7 @@ class TestZulipBinding extends ZulipBinding {
   /// The value that `ZulipBinding.instance.pickFiles()` should return.
   ///
   /// See also [takePickFilesCalls].
-  file_picker.FilePickerResult? pickFilesResult;
+  FilePickerResult? pickFilesResult;
 
   void _resetPickFiles() {
     pickFilesResult = null;
@@ -311,7 +310,7 @@ class TestZulipBinding extends ZulipBinding {
   List<({
     bool? allowMultiple,
     bool? withReadStream,
-    file_picker.FileType? type,
+    FileType? type,
   })> takePickFilesCalls() {
     final result = _pickFilesCalls;
     _pickFilesCalls = null;
@@ -320,14 +319,14 @@ class TestZulipBinding extends ZulipBinding {
   List<({
     bool? allowMultiple,
     bool? withReadStream,
-    file_picker.FileType? type,
+    FileType? type,
   })>? _pickFilesCalls;
 
   @override
-  Future<file_picker.FilePickerResult?> pickFiles({
+  Future<FilePickerResult?> pickFiles({
     bool? allowMultiple,
     bool? withReadStream,
-    file_picker.FileType? type,
+    FileType? type,
   }) async {
     (_pickFilesCalls ??= []).add((allowMultiple: allowMultiple, withReadStream: withReadStream, type: type));
     return pickFilesResult;
diff --git a/test/widgets/compose_box_test.dart b/test/widgets/compose_box_test.dart
index 01b608b1c85..db623774a93 100644
--- a/test/widgets/compose_box_test.dart
+++ b/test/widgets/compose_box_test.dart
@@ -1,13 +1,13 @@
 import 'dart:convert';
 
 import 'package:checks/checks.dart';
-import 'package:file_picker/file_picker.dart';
 import 'package:http/http.dart' as http;
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/zulip_localizations.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:image_picker/image_picker.dart';
 import 'package:zulip/api/route/messages.dart';
+import 'package:zulip/model/binding.dart';
 import 'package:zulip/model/localizations.dart';
 import 'package:zulip/model/narrow.dart';
 import 'package:zulip/model/store.dart';