Fix Floating Window

Change-Id: Icf48df5d6ffbfb8e6b16a632f5135a0fa02dd946