Fix screens being forced to reload after certain actions
