More graceful dealing with minibuffer