Adds support for the case where only shapes are selected