Improved edit shortcut