Merge "Fix a Bug on Editor Screen"