Fixed keyboard issues in Automatic

#485