WIP: Two bugs in the offcanvas element

[HOSEIN]

Hi @Matej,

I think this report is quite similar to this one?