diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist
index 4c8b2bef1..6e13d6df6 100644
--- a/Signal/Signal-Info.plist
+++ b/Signal/Signal-Info.plist
@@ -38,7 +38,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2.26.0.21</string>
+	<string>2.26.0.22</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LOGS_EMAIL</key>
diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
index ac1b53cc4..861314ec2 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@@ -4115,7 +4115,9 @@ typedef enum : NSUInteger {
         self.scrollDownButton.frame = newButtonFrame;
 
         // Adjust content offset to prevent the presented keyboard from obscuring content.
-        if (wasScrolledToBottom) {
+        if (!self.viewHasEverAppeared) {
+            [self scrollToDefaultPosition];
+        } else if (wasScrolledToBottom) {
             // If we were scrolled to the bottom, don't do any fancy math. Just stay at the bottom.
             [self scrollToBottomAnimated:NO];
         } else {
diff --git a/SignalShareExtension/Info.plist b/SignalShareExtension/Info.plist
index 209872110..abfc82901 100644
--- a/SignalShareExtension/Info.plist
+++ b/SignalShareExtension/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>2.26.0</string>
 	<key>CFBundleVersion</key>
-	<string>2.26.0.21</string>
+	<string>2.26.0.22</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>NSAppTransportSecurity</key>
diff --git a/SignalShareExtension/utils/ShareAppExtensionContext.m b/SignalShareExtension/utils/ShareAppExtensionContext.m
index b7baa134d..35dec6ddc 100644
--- a/SignalShareExtension/utils/ShareAppExtensionContext.m
+++ b/SignalShareExtension/utils/ShareAppExtensionContext.m
@@ -34,7 +34,7 @@ NS_ASSUME_NONNULL_BEGIN
 
     _rootViewController = rootViewController;
 
-    self.reportedApplicationState = UIApplicationStateInactive;
+    self.reportedApplicationState = UIApplicationStateActive;
 
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(extensionHostDidBecomeActive:)