diff --git a/android/app/build.gradle b/android/app/build.gradle
index bed041b24..5cafd434f 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -113,7 +113,7 @@ android {
         applicationId "com.mattermost.rnbeta"
         minSdkVersion 21
         targetSdkVersion 26
-        versionCode 141
+        versionCode 142
         versionName "1.12.0"
         multiDexEnabled = true
         ndk {
diff --git a/app/components/options_context/options_context.ios.js b/app/components/options_context/options_context.ios.js
index 615373967..12713d6a6 100644
--- a/app/components/options_context/options_context.ios.js
+++ b/app/components/options_context/options_context.ios.js
@@ -50,10 +50,14 @@ export default class OptionsContext extends PureComponent {
         }
     };
 
+    handleShow = () => {
+        this.isShowing = true;
+        this.props.toggleSelected(true);
+    }
+
     handleShowUnderlay = () => {
         this.beforeShow();
         this.props.toggleSelected(true);
-        this.isShowing = this.state.actions.length > 0;
     };
 
     hide = () => {
@@ -93,6 +97,7 @@ export default class OptionsContext extends PureComponent {
                 arrowDirection='down'
                 longPress={true}
                 onHide={this.handleHide}
+                onShow={this.handleShow}
                 onPress={this.handlePress}
                 underlayColor='transparent'
             >
diff --git a/ios/Mattermost.xcodeproj/project.pbxproj b/ios/Mattermost.xcodeproj/project.pbxproj
index a28c28b96..301104ad0 100644
--- a/ios/Mattermost.xcodeproj/project.pbxproj
+++ b/ios/Mattermost.xcodeproj/project.pbxproj
@@ -2427,7 +2427,7 @@
 				CODE_SIGN_ENTITLEMENTS = Mattermost/Mattermost.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 141;
+				CURRENT_PROJECT_VERSION = 142;
 				DEAD_CODE_STRIPPING = NO;
 				DEVELOPMENT_TEAM = UQ8HT4Q2XM;
 				ENABLE_BITCODE = NO;
@@ -2476,7 +2476,7 @@
 				CODE_SIGN_ENTITLEMENTS = Mattermost/Mattermost.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 141;
+				CURRENT_PROJECT_VERSION = 142;
 				DEAD_CODE_STRIPPING = NO;
 				DEVELOPMENT_TEAM = UQ8HT4Q2XM;
 				ENABLE_BITCODE = NO;
diff --git a/ios/Mattermost/Info.plist b/ios/Mattermost/Info.plist
index cb53db03d..9625dc8ac 100644
--- a/ios/Mattermost/Info.plist
+++ b/ios/Mattermost/Info.plist
@@ -34,7 +34,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>141</string>
+	<string>142</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>
diff --git a/ios/MattermostShare/Info.plist b/ios/MattermostShare/Info.plist
index 9c7e6191a..6b9d70c3a 100644
--- a/ios/MattermostShare/Info.plist
+++ b/ios/MattermostShare/Info.plist
@@ -23,7 +23,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.12.0</string>
 	<key>CFBundleVersion</key>
-	<string>141</string>
+	<string>142</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>
diff --git a/ios/MattermostTests/Info.plist b/ios/MattermostTests/Info.plist
index 49396922c..9bf9a6d3c 100644
--- a/ios/MattermostTests/Info.plist
+++ b/ios/MattermostTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>141</string>
+	<string>142</string>
 </dict>
 </plist>