diff --git a/package.json b/package.json
index e26c7b54..1bf34b16 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
     "native": "210511",
     "major": 2,
     "minor": 1,
-    "patch": 1,
+    "patch": 2,
     "expo": "41.0.0"
   },
   "description": "tooot app for Mastodon",
diff --git a/src/components/Timeline/Shared/Attachment/Video.tsx b/src/components/Timeline/Shared/Attachment/Video.tsx
index c678feaa..35ad16e9 100644
--- a/src/components/Timeline/Shared/Attachment/Video.tsx
+++ b/src/components/Timeline/Shared/Attachment/Video.tsx
@@ -84,16 +84,20 @@ const AttachmentVideo: React.FC<Props> = ({
             })}
         useNativeControls={false}
         onFullscreenUpdate={event => {
-          if (event.fullscreenUpdate === 3) {
-            analytics('timeline_shared_attachment_video_pause_press', {
-              id: video.id,
-              timestamp: Date.now()
-            })
-            videoPlayer.current?.pauseAsync()
+          if (
+            event.fullscreenUpdate ===
+            Video.FULLSCREEN_UPDATE_PLAYER_DID_DISMISS
+          ) {
+            if (gifv) {
+              videoPlayer.current?.setIsLoopingAsync(true)
+              videoPlayer.current?.playAsync()
+            } else {
+              videoPlayer.current?.pauseAsync()
+            }
           }
         }}
       />
-      <Pressable style={styles.overlay}>
+      <Pressable style={styles.overlay} onPress={gifv ? playOnPress : null}>
         {sensitiveShown ? (
           video.blurhash ? (
             <Blurhash
diff --git a/src/components/openLink.ts b/src/components/openLink.ts
index a5e041da..4edbdce8 100644
--- a/src/components/openLink.ts
+++ b/src/components/openLink.ts
@@ -123,14 +123,15 @@ const openLink = async (
 
   loadingLink = false
   switch (getSettingsBrowser(store.getState())) {
+    // Some links might end with an empty space at the end that triggers an error
     case 'internal':
-      await WebBrowser.openBrowserAsync(url, {
+      await WebBrowser.openBrowserAsync(encodeURI(url), {
         dismissButtonStyle: 'close',
         enableBarCollapsing: true
       })
       break
     case 'external':
-      await Linking.openURL(url)
+      await Linking.openURL(encodeURI(url))
       break
   }
 }