@EWD-633 -> Add auto position popup