Menu Fix

Fix to stop the even handler for the menu after it's gone.