diff --git a/src/lib/ContextMenus.tsx b/src/lib/ContextMenus.tsx
index 2414cdeb..0fe858cd 100644
--- a/src/lib/ContextMenus.tsx
+++ b/src/lib/ContextMenus.tsx
@@ -860,7 +860,21 @@ export default function ContextMenus() {
                             message,
                         });
                         if (channelPermissions & Permission.ManageMessages) {
-                            if (message.is_pinned && channel?.channel_type != "DirectMessage") {
+                            if (message.is_pinned) {
+                                generateAction({
+                                    action: "unpin_message",
+                                    channel,
+                                    message
+                                });
+                            } else {
+                                generateAction({
+                                    action: "pin_message",
+                                    channel,
+                                    message
+                                });
+                            }
+                        } else if (message.channel?.channel_type == "DirectMessage" || message.channel?.channel_type == "Group") {
+                            if (message.is_pinned) {
                                 generateAction({
                                     action: "unpin_message",
                                     channel,
@@ -873,7 +887,6 @@ export default function ContextMenus() {
                                     message
                                 });
                             }
-
                         }
 
                         if (