diff --git a/frontend/web/components/FeatureRow.js b/frontend/web/components/FeatureRow.js
index e3bd3d037aa3..2f56b1c30ace 100644
--- a/frontend/web/components/FeatureRow.js
+++ b/frontend/web/components/FeatureRow.js
@@ -60,9 +60,7 @@ class TheComponent extends Component {
     history.replaceState(
       {},
       null,
-      `${document.location.pathname}?feature=${projectFlag.id}${
-        tab ? `&tab=${tab}` : ''
-      }`,
+      `${document.location.pathname}?feature=${projectFlag.id}`,
     )
     openModal(
       `${this.props.permission ? 'Edit Feature' : 'Feature'}: ${
@@ -75,6 +73,7 @@ class TheComponent extends Component {
         projectFlag={projectFlag}
         noPermissions={!this.props.permission}
         environmentFlag={environmentFlag}
+        tab={tab}
         flagId={environmentFlag.id}
       />,
       'side-modal create-feature-modal',
@@ -222,22 +221,29 @@ class TheComponent extends Component {
                 </span>
 
                 {!!projectFlag.num_segment_overrides && (
-                  <Tooltip
-                    title={
-                      <span
-                        className='chip me-2 chip--xs bg-primary text-white'
-                        style={{ border: 'none' }}
-                      >
-                        <SegmentsIcon className='chip-svg-icon' />
-                        <span>{projectFlag.num_segment_overrides}</span>
-                      </span>
-                    }
-                    place='top'
+                  <div
+                    onClick={(e) => {
+                      e.stopPropagation()
+                      this.editFeature(projectFlag, environmentFlags[id], 1)
+                    }}
                   >
-                    {`${projectFlag.num_segment_overrides} Segment Override${
-                      projectFlag.num_segment_overrides !== 1 ? 's' : ''
-                    }`}
-                  </Tooltip>
+                    <Tooltip
+                      title={
+                        <span
+                          className='chip me-2 chip--xs bg-primary text-white'
+                          style={{ border: 'none' }}
+                        >
+                          <SegmentsIcon className='chip-svg-icon' />
+                          <span>{projectFlag.num_segment_overrides}</span>
+                        </span>
+                      }
+                      place='top'
+                    >
+                      {`${projectFlag.num_segment_overrides} Segment Override${
+                        projectFlag.num_segment_overrides !== 1 ? 's' : ''
+                      }`}
+                    </Tooltip>
+                  </div>
                 )}
                 {!!projectFlag.num_identity_overrides && (
                   <Tooltip
diff --git a/frontend/web/components/modals/CreateFlag.js b/frontend/web/components/modals/CreateFlag.js
index 11f07087e1f3..aaecb9738383 100644
--- a/frontend/web/components/modals/CreateFlag.js
+++ b/frontend/web/components/modals/CreateFlag.js
@@ -56,7 +56,7 @@ const CreateFlag = class extends Component {
       : {
           multivariate_options: [],
         }
-    const { allowEditDescription } = this.props
+    const { allowEditDescription, tab } = this.props
     if (this.props.projectFlag) {
       this.userOverridesPage(1)
     }
@@ -84,7 +84,7 @@ const CreateFlag = class extends Component {
       name,
       period: 30,
       selectedIdentity: null,
-      tab: Utils.fromParam().tab || 0,
+      tab: tab || 0,
       tags: tags || [],
     }
     AppActions.getGroups(AccountStore.getOrganisation().id)