Fix issue with Return Home button always being available