[[ Bugfix 13548 ]] Fix calculation for tab-on-return