set correct keygard window flags also the first time

Change-Id: I29d41a011d545fdfbeafb16eb31c26144f76fc7d