When adding JIRA Issue/Filter macro to a table with other JIRA macros, the macro gets replaces the wrong cell inside of a table

Issue Summary

When editing and adding a couple of JIRA Issue/Filter inside of a table, the macro will be added to the wrong cell if the user press ESC to close the previous macro.

Environment

• Confluence 7.0.1
• Jira 8.1.2

Steps to Reproduce

1. Create a table
2. Insert a JIRA Issue/Filter macro with any JQL and save the macro
3. Click on the JIRA Issue/Filter macro just added and select Edit
4. Press ESC
5. Select the First cell below the existing Jira macro
6. Add a new Jira macro, insert a JQL and save the macro

Expected Results

The macro should be added to the correct cell

Actual Results

The macro will replace the existing macro, on the above cell

Notes

This doesn't happen if instead of pressing ESC, the user clicks Cancel the previous macro.

Workaround

Click Cancel to close the previous macro instead of using ESC