diff --git a/shared/stories/__rntests__/__snapshots__/Storyshots-rn.js.snap b/shared/stories/__rntests__/__snapshots__/Storyshots-rn.js.snap
index 24c3b2928fea..8bace407a654 100644
--- a/shared/stories/__rntests__/__snapshots__/Storyshots-rn.js.snap
+++ b/shared/stories/__rntests__/__snapshots__/Storyshots-rn.js.snap
@@ -658412,21 +658412,40 @@ Array [
               ]
             }
           >
-            <Text
-              allowFontScaling={false}
-              onPress={[Function]}
+            <View
               style={
-                Object {
-                  "color": "#3663EA",
-                  "fontFamily": "Keybase",
-                  "fontSize": 17,
-                  "fontWeight": "600",
-                  "lineHeight": 21,
-                }
+                Array [
+                  Object {
+                    "alignItems": "stretch",
+                    "flexDirection": "row",
+                    "justifyContent": "flex-start",
+                  },
+                  Object {
+                    "alignSelf": "center",
+                  },
+                  Object {
+                    "justifyContent": "flex-end",
+                    "width": 48,
+                  },
+                ]
               }
             >
-              Skip
-            </Text>
+              <Text
+                allowFontScaling={false}
+                onPress={[Function]}
+                style={
+                  Object {
+                    "color": "#3663EA",
+                    "fontFamily": "Keybase",
+                    "fontSize": 17,
+                    "fontWeight": "600",
+                    "lineHeight": 21,
+                  }
+                }
+              >
+                Skip
+              </Text>
+            </View>
           </View>
         </View>
       </View>
diff --git a/shared/teams/new-team/wizard/add-subteam-members.tsx b/shared/teams/new-team/wizard/add-subteam-members.tsx
index 575d5d837347..f006472e99cb 100644
--- a/shared/teams/new-team/wizard/add-subteam-members.tsx
+++ b/shared/teams/new-team/wizard/add-subteam-members.tsx
@@ -83,9 +83,11 @@ const AddSubteamMembers = () => {
       header={{
         leftButton: <Kb.Icon type="iconfont-arrow-left" onClick={onBack} />,
         rightButton: Styles.isMobile ? (
-          <Kb.Text type="BodyBigLink" onClick={onContinue}>
-            {doneLabel}
-          </Kb.Text>
+          <Kb.Box2 direction="horizontal" style={styles.noWrap}>
+            <Kb.Text type="BodyBigLink" onClick={onContinue}>
+              {doneLabel}
+            </Kb.Text>
+          </Kb.Box2>
         ) : (
           undefined
         ),
@@ -143,6 +145,10 @@ const styles = Styles.styleSheetCreate(() => ({
     paddingRight: Styles.globalMargins.small,
   },
   hideOverflow: {overflow: 'hidden'},
+  noWrap: {
+    justifyContent: 'flex-end',
+    width: 48, // wide enough for "Done" or "Skip" to fit. workaround modal2 header measurement onmount
+  },
   search: {
     borderRadius: 4,
   },