diff --git a/contents/docs/feature-flags/creating-feature-flags.mdx b/contents/docs/feature-flags/creating-feature-flags.mdx
index 8312e254b206..ed5a81696504 100644
--- a/contents/docs/feature-flags/creating-feature-flags.mdx
+++ b/contents/docs/feature-flags/creating-feature-flags.mdx
@@ -249,3 +249,41 @@ You can use tags to accomplish:
 </CalloutBox>
 
 We recommend reading the [evaluation contexts documentation](/docs/feature-flags/evaluation-contexts) in detail before using it in production.
+
+## Editing feature flags
+
+After creating a feature flag, you can edit it directly from the flag's overview page without navigating to a separate edit form.
+
+### Inline editing
+
+Hover over any editable section on the feature flag overview page to reveal an **Edit** button. Click it to enter edit mode for that section. The following sections support inline editing:
+
+| Section | What you can edit |
+|---------|-------------------|
+| **Advanced options** | Tags, evaluation runtime, persistence settings |
+| **Payload** | JSON payload values for boolean flags |
+| **Release conditions** | Targeting rules and rollout percentages |
+| **Variants** | Variant keys, rollout percentages, descriptions, and payloads |
+
+After making changes, click **Save** to apply them or **Cancel** to discard. If you cancel with unsaved changes, a confirmation dialog appears to prevent accidental data loss.
+
+<CalloutBox icon="IconInfo" title="One section at a time" type="fyi">
+
+You can only edit one section at a time. Save or cancel your current edits before editing another section.
+
+</CalloutBox>
+
+### Editing the flag description
+
+The flag description is editable directly from the overview page. Click on the description text to edit it inline. Changes save automatically when you click away.
+
+### Editing the flag key
+
+The flag key is not editable from the overview page because changing it can break SDK calls like `posthog.isFeatureEnabled('your-flag-key')` or `posthog.getFeatureFlag('your-flag-key')`.
+
+To change a flag key, use the full edit form. When you change the key, PostHog shows an inline warning under the key field and requires confirmation before saving.
+
+### Experiment-linked flags
+
+For feature flags linked to an [experiment](/docs/experiments), inline editing is restricted for **variants** and **release conditions** since these are managed by the experiment.
+
diff --git a/contents/docs/feature-flags/start-here.mdx b/contents/docs/feature-flags/start-here.mdx
index 49ca1e6127aa..433f3c309a35 100644
--- a/contents/docs/feature-flags/start-here.mdx
+++ b/contents/docs/feature-flags/start-here.mdx
@@ -72,6 +72,7 @@ import OSButton from 'components/OSButton'
   - **Phased rollout** &mdash; Start at 5-10% of users, monitor metrics, then gradually increase
   - **Target by properties** &mdash; Show features to specific users, cohorts, or groups
   - **Set up dependencies** &mdash; Make flags depend on other flags for complex rollout strategies
+  - **Edit inline** &mdash; Update release conditions, payloads, and variants directly from the flag overview page
 
   <ProductScreenshot
       imageLight="https://res.cloudinary.com/dmukukwp6/image/upload/w_1600,c_limit,q_auto,f_auto/create_feature_flags_light_133081fabc.png"