diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/CollectActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/CollectActivity.java
index fa76c23b1..7eaba0661 100644
--- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/CollectActivity.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/CollectActivity.java
@@ -91,8 +91,8 @@ public class CollectActivity extends BaseActivity implements SiteCallback, WordA
         setRecyclerView();
         setLayoutSize();
         setViewModel();
+        checkKeyword();
         setViewType();
-        setKeyword();
         setSite();
         getHot();
         search();
@@ -151,9 +151,14 @@ public class CollectActivity extends BaseActivity implements SiteCallback, WordA
         });
     }
 
-    private void setKeyword() {
+    private void checkKeyword() {
         if (TextUtils.isEmpty(getKeyword())) mBinding.keyword.requestFocus();
-        else mBinding.keyword.setText(getKeyword());
+        else setKeyword(getKeyword());
+    }
+
+    private void setKeyword(String text) {
+        mBinding.keyword.setText(text);
+        mBinding.keyword.setSelection(text.length());
     }
 
     private void setSite() {
@@ -236,8 +241,7 @@ public class CollectActivity extends BaseActivity implements SiteCallback, WordA
 
     @Override
     public void onItemClick(String text) {
-        mBinding.keyword.setText(text);
-        mBinding.keyword.setSelection(text.length());
+        setKeyword(text);
         search();
     }
 
diff --git a/app/src/mobile/res/drawable/shape_accent.xml b/app/src/mobile/res/drawable/shape_accent.xml
index 4ef71bc17..068c51065 100644
--- a/app/src/mobile/res/drawable/shape_accent.xml
+++ b/app/src/mobile/res/drawable/shape_accent.xml
@@ -15,8 +15,8 @@
                 android:color="?attr/colorOutline" />
             <padding
                 android:bottom="8dp"
-                android:left="16dp"
-                android:right="16dp"
+                android:left="12dp"
+                android:right="12dp"
                 android:top="8dp" />
         </shape>
     </item>
diff --git a/app/src/mobile/res/layout/activity_collect.xml b/app/src/mobile/res/layout/activity_collect.xml
index 62464a83e..7e55cb327 100644
--- a/app/src/mobile/res/layout/activity_collect.xml
+++ b/app/src/mobile/res/layout/activity_collect.xml
@@ -91,7 +91,7 @@
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/wordRecycler"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:clipChildren="false"
             android:clipToPadding="false"
             android:padding="8dp"
diff --git a/app/src/mobile/res/layout/dialog_control.xml b/app/src/mobile/res/layout/dialog_control.xml
index 29972be1b..009bac0c2 100644
--- a/app/src/mobile/res/layout/dialog_control.xml
+++ b/app/src/mobile/res/layout/dialog_control.xml
@@ -67,6 +67,7 @@
             android:layout_marginEnd="8dp"
             android:background="@drawable/shape_accent"
             android:gravity="center"
+            android:singleLine="true"
             android:tag="0"
             android:textColor="@color/control"
             android:textSize="14sp"
@@ -79,6 +80,7 @@
             android:layout_marginEnd="8dp"
             android:background="@drawable/shape_accent"
             android:gravity="center"
+            android:singleLine="true"
             android:tag="1"
             android:textColor="@color/control"
             android:textSize="14sp"
@@ -91,6 +93,7 @@
             android:layout_marginEnd="8dp"
             android:background="@drawable/shape_accent"
             android:gravity="center"
+            android:singleLine="true"
             android:tag="2"
             android:textColor="@color/control"
             android:textSize="14sp"
@@ -103,6 +106,7 @@
             android:layout_marginEnd="8dp"
             android:background="@drawable/shape_accent"
             android:gravity="center"
+            android:singleLine="true"
             android:tag="3"
             android:textColor="@color/control"
             android:textSize="14sp"
@@ -114,6 +118,7 @@
             android:layout_height="wrap_content"
             android:background="@drawable/shape_accent"
             android:gravity="center"
+            android:singleLine="true"
             android:tag="4"
             android:textColor="@color/control"
             android:textSize="14sp"
@@ -142,6 +147,7 @@
             android:layout_marginEnd="8dp"
             android:background="@drawable/shape_accent"
             android:gravity="center"
+            android:singleLine="true"
             android:textColor="@color/control"
             android:textSize="14sp"
             tools:text="EXO" />
@@ -153,6 +159,7 @@
             android:layout_marginEnd="8dp"
             android:background="@drawable/shape_accent"
             android:gravity="center"
+            android:singleLine="true"
             android:textColor="@color/control"
             android:textSize="14sp"
             tools:text="硬解" />
@@ -164,6 +171,7 @@
             android:layout_marginEnd="8dp"
             android:background="@drawable/shape_accent"
             android:gravity="center"
+            android:singleLine="true"
             android:text="@string/play_loop"
             android:textColor="@color/control"
             android:textSize="14sp" />
@@ -175,6 +183,7 @@
             android:layout_marginEnd="8dp"
             android:background="@drawable/shape_accent"
             android:gravity="center"
+            android:singleLine="true"
             android:textColor="@color/control"
             android:textSize="14sp"
             tools:text="片頭" />
@@ -186,6 +195,7 @@
             android:layout_marginEnd="0dp"
             android:background="@drawable/shape_accent"
             android:gravity="center"
+            android:singleLine="true"
             android:textColor="@color/control"
             android:textSize="14sp"
             tools:text="片尾" />