MOBILE-316 Fixing Buttons not cleared from dialogue