Popup Display -- Shortcodes

Fix problems that occur with shortcodes in the editor.