diff --git a/Assets/Scripts/UI/Prefab/Race/RaceHomeScript.cs b/Assets/Scripts/UI/Prefab/Race/RaceHomeScript.cs
index 59acffba..f798d936 100644
--- a/Assets/Scripts/UI/Prefab/Race/RaceHomeScript.cs
+++ b/Assets/Scripts/UI/Prefab/Race/RaceHomeScript.cs
@@ -167,6 +167,8 @@ public class RaceHomeScript : RaceScript
             //scroll.content
         }
         rightContainer.Find("Container-2/BtnGoList").SetAsLastSibling();
+        rightContainer.Find("Container-2/BtnGoList").GetComponent<RaceMaskScript>().localY =
+            list.Count < 4 ? -167.5f :-492.5f;
     }
     void OnBannerClick(MapCompetition map) 
     {
diff --git a/Assets/Scripts/UI/Prefab/Race/RaceMaskScript.cs b/Assets/Scripts/UI/Prefab/Race/RaceMaskScript.cs
index bd3f0cbf..68543e8c 100644
--- a/Assets/Scripts/UI/Prefab/Race/RaceMaskScript.cs
+++ b/Assets/Scripts/UI/Prefab/Race/RaceMaskScript.cs
@@ -5,21 +5,23 @@ using UnityEngine;
 using UnityEngine.EventSystems;
 public class RaceMaskScript : MonoBehaviour, IPointerEnterHandler,IPointerExitHandler
 {
-    float? localY = null;
+    public float? localY { get; set; }
     public void OnPointerEnter(PointerEventData eventData)
     {
         transform.Find("Panel").GetComponent<CanvasGroup>().DOFade(1, 0.5f);
-        if (localY == null)
+        if (localY.HasValue) 
         {
-            localY = transform.localPosition.y;
+            transform.DOLocalMoveY(localY.Value + 5, 0.3f);
         }
-        transform.DOLocalMoveY(localY.Value + 5, 0.3f);
     }
 
     public void OnPointerExit(PointerEventData eventData)
     {
         transform.Find("Panel").GetComponent<CanvasGroup>().DOFade(0, 0.5f);
-        transform.DOLocalMoveY(localY.Value, 0.3f);
+        if (localY.HasValue) 
+        {
+            transform.DOLocalMoveY(localY.Value, 0.3f);
+        }
     }
 
     // Start is called before the first frame update