Fix bug where a full, non-collapsible top row would infinite loop