Tweak floating save + fix cancel