Fix Floating Window

Change-Id: I12257f21672094791cdfc802c62a7ef5837721d1