Fixed issue with keyboard not disappearing