Do not create element when screen is selected (see #10317)
Merge pull request #862 from jburel/rebased/develop/dataset-creation

Do not create element when screen is selected (see #10317) (rebased onto develop)