Fixing issue with natural navigation and modal option