diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index eeb53b79a..d8177e9df 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -63,11 +63,21 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:mimeType="image/*" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.SEND" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="video/*" />
+            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.SEND_MULTIPLE" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:mimeType="image/*" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.SEND_MULTIPLE" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="video/*" />
+            </intent-filter>
         </activity>
         <activity
             android:name=".ViewVideoActivity"
diff --git a/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java b/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
index 032dfe5c0..055a1edf8 100644
--- a/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
+++ b/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
@@ -562,7 +562,7 @@ public final class ComposeActivity
              * instance state will be re-queued. */
             String type = intent.getType();
             if (type != null) {
-                if (type.startsWith("image/")) {
+                if (type.startsWith("image/") || type.startsWith("video/")) {
                     List<Uri> uriList = new ArrayList<>();
                     if (intent.getAction() != null) {
                         switch (intent.getAction()) {