2.3 Fixed page editing

Fixed page editing #2904

Please confirm that this works for you.