On demand restricting control in application list

Fixes #1615