COMMONS-294: Remove space for the case without scroll