Done at https://github.com/WordPress/gutenberg/pull/20530/files?file-filters%5B%5D=.scss#diff-ea6e8e5d17ac512ea81dc2085c71bf43R53 This was... tricky :sweat_smile:     I tested with the document & block sidebars (edit-post) and global & block sidebars (edit-site). Everything seems to be fine, at least I don't find any gross leak now.