Issue #2339465 by catch: Double rendering of mini panels