Bug fix on hang during Mac command + Q.