desktop composer fix
Merge pull request #2285 from awesomerobot/master

desktop composer fix