Partial fix for issue 'Add new content elements on grid is really buggy'