Fix expanded desktop options

Change-Id: I4d6d96d27fed89e4ea0d44c847fe9a8fc8007103