diff --git a/common/src/main/java/com/yunbao/common/dialog/GiftWallGiftInfoDialog.java b/common/src/main/java/com/yunbao/common/dialog/GiftWallGiftInfoDialog.java
index 6b554682f..3ca287050 100644
--- a/common/src/main/java/com/yunbao/common/dialog/GiftWallGiftInfoDialog.java
+++ b/common/src/main/java/com/yunbao/common/dialog/GiftWallGiftInfoDialog.java
@@ -277,7 +277,7 @@ public class GiftWallGiftInfoDialog extends AbsDialogPopupWindow {
 
     void initData() {
         adapter.setList_type(list_type);
-        if (isAnchor) {
+        if (isAnchor || (isTab2Enter && isStar)) {
             if (isStar) {
                 gift_hall_type = 2;
             } else {
diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java b/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java
index f62688e2d..18642bc1d 100644
--- a/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java
+++ b/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java
@@ -839,6 +839,8 @@ public class LiveGiftPopup extends AbsDialogFragment {
                                 boolean isPageGift = liveGiftModel.isPageGift();
                                 liveGiftModel = JSONObject.parseObject(GsonUtils.toJson(data), LiveGiftBean.class);
                                 liveGiftModel.setPageGift(isPageGift);
+                                liveGiftModel.setGift_id(giftId);
+                                liveGiftModel.setId(giftId);
                                 if (!TextUtils.isEmpty(liveGiftModel.getNamingLiveuid()) &&
                                         !TextUtils.isEmpty(liveGiftModel.getNamingUid()) &&
                                         !TextUtils.equals(liveGiftModel.getNamingLiveuid(), "0") &&
diff --git a/main/src/main/java/com/yunbao/main/views/MainHomeLiveViewHolder.java b/main/src/main/java/com/yunbao/main/views/MainHomeLiveViewHolder.java
index 81304ff53..1fe92a305 100644
--- a/main/src/main/java/com/yunbao/main/views/MainHomeLiveViewHolder.java
+++ b/main/src/main/java/com/yunbao/main/views/MainHomeLiveViewHolder.java
@@ -470,8 +470,11 @@ public class MainHomeLiveViewHolder extends AbsMainHomeChildViewHolder implement
                                     } else if ("home_page_banner_battle".equals(link)) {
                                         RouteUtil.forwardBattlePass();
                                     } else if ("home_page_banner_giftwall".equals(link)) {
+                                        if (mShowLoadingDialog != null && mShowLoadingDialog.isShowing()) {
+                                            mShowLoadingDialog.dismiss();
+                                        }
                                         new GiftWallDialog(mContext, IMLoginManager.get(mContext).getUserInfo().getId() + "",
-                                                IMLoginManager.get(mContext).getUserInfo().getUserNicename(),null
+                                                IMLoginManager.get(mContext).getUserInfo().getUserNicename(), null
                                                 , false).setFullWindows(true).setTab2(true).showDialog();
                                     } else {
                                         gotoLive(link);