Show proper status in edit window

Show proper status in edit window