diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5173e5795c..0d96cc2dbd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,8 @@ These changes are available on the `master` branch, but have not yet been releas
   ([#3231](https://github.com/Pycord-Development/pycord/pull/3231))
 - Allow `ForumTag` to be created without an emoji.
   ([#3245](https://github.com/Pycord-Development/pycord/pull/3245))
+- Fixed `PartialMessage.edit` to work with `DesignerView`.
+  ([#3237](https://github.com/Pycord-Development/pycord/pull/3237))
 
 ### Deprecated
 
diff --git a/discord/message.py b/discord/message.py
index 1781bf45f1..5dffbbe668 100644
--- a/discord/message.py
+++ b/discord/message.py
@@ -2549,7 +2549,6 @@ async def edit(self, **fields: Any) -> Message | None:
         suppress = fields.pop("suppress", False)
         flags = MessageFlags._from_value(0)
         flags.suppress_embeds = suppress
-        fields["flags"] = flags.value
 
         delete_after = fields.pop("delete_after", None)
 
@@ -2573,7 +2572,10 @@ async def edit(self, **fields: Any) -> Message | None:
         if view is not MISSING:
             self._state.prevent_view_updates_for(self.id)
             fields["components"] = view.to_components() if view else []
+            if view and view.is_components_v2():
+                flags.is_components_v2 = True
 
+        fields["flags"] = flags.value
         if fields:
             data = await self._state.http.edit_message(
                 self.channel.id, self.id, **fields