diff --git a/CLAUDE.md b/CLAUDE.md
index c40921a..bcdc375 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -429,6 +429,8 @@ Due to Qt's visual display synchronization, thread collapse may require double-o
 - **Ctrl+F**: Favorite selected post
 - **Ctrl+C**: Copy selected post to clipboard
 - **Ctrl+U**: Open URLs from selected post in browser
+- **Ctrl+Shift+E**: Edit selected post (your own posts only)
+- **Shift+Delete**: Delete selected post (your own posts only)
 - **F5**: Refresh timeline
 - **Ctrl+,**: Settings
 - **Escape**: Close dialogs
@@ -548,6 +550,7 @@ verbose_announcements = true
 - **Poll Voting**: ✅ Accessible poll interaction with keyboard navigation
 - **User Profile Viewer**: ✅ Comprehensive profile dialog with bio, fields, recent posts
 - **Social Actions**: ✅ Follow/unfollow, block/unblock, mute/unmute from profile viewer
+- **Post Editing**: ✅ Edit your own posts and DMs with proper local/federated ownership detection
 
 ### Remaining High Priority Features
 - **User Blocking Management**: Block/unblock users with dedicated management interface
@@ -724,4 +727,5 @@ content_text.setTextInteractionFlags(Qt.TextSelectableByKeyboard | Qt.TextSelect
 This document serves as the comprehensive development guide for Bifrost, ensuring all accessibility, functionality, and architectural decisions are preserved and can be 
 referenced throughout development.
 
-- When adding or adjusting features be extremely thorough. Make sure every aspect of the code having to do with the feature or fix is completely updated.
\ No newline at end of file
+- When adding or adjusting features be extremely thorough. Make sure every aspect of the code having to do with the feature or fix is completely updated.
+- Always update documentation especially if anything such as keybindings changes.
\ No newline at end of file
diff --git a/README.md b/README.md
index bfbb98c..051a715 100644
--- a/README.md
+++ b/README.md
@@ -32,6 +32,7 @@ This project was created through "vibe coding" - a collaborative development app
 - **Thread Expansion**: Full conversation context fetching for complete thread viewing
 - **Blocked/Muted Management**: Dedicated tabs for managing blocked and muted users
 - **Custom Emoji Support**: Instance-specific emoji support with caching
+- **Post Editing**: Edit your own posts and direct messages with full content preservation
 
 ## Audio System
 
@@ -96,6 +97,8 @@ Bifrost includes a sophisticated sound system with intelligent notification hand
 - **Ctrl+F**: Favorite selected post
 - **Ctrl+C**: Copy selected post to clipboard
 - **Ctrl+U**: Open URLs from selected post in browser
+- **Ctrl+Shift+E**: Edit selected post (your own posts only)
+- **Shift+Delete**: Delete selected post (your own posts only)
 - **Ctrl+Shift+B**: Block user who authored selected post
 - **Ctrl+Shift+M**: Mute user who authored selected post
 - **Applications Key/Shift+F10**: Open context menu with all post actions