Fix for previous commit
Merge pull request #3532 from ussuri/spark-dialog-fixes

Fix previous commit