12afde8 Fix modal / sidebar incompatibilities