wip/popup-el-current
