Edit buttons: More dock-related fixes

Edit buttons should now play nice with the dock on 2.3 and 2.4.