diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomKeyboard.java b/app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomKeyboard.java
index 243e85dda..85c013171 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomKeyboard.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomKeyboard.java
@@ -30,7 +30,7 @@ public class CustomKeyboard implements KeyboardAdapter.OnClickListener {
     public void onTextClick(String text) {
         StringBuilder sb = new StringBuilder(binding.keyword.getText().toString());
         int cursor = binding.keyword.getSelectionStart();
-        if (binding.keyword.length() > 29) return;
+        if (binding.keyword.length() > 19) return;
         sb.insert(cursor, text);
         binding.keyword.setText(sb.toString());
         binding.keyword.setSelection(cursor + 1);
diff --git a/app/src/leanback/res/layout/activity_search.xml b/app/src/leanback/res/layout/activity_search.xml
index 1cccdf073..3239340b9 100644
--- a/app/src/leanback/res/layout/activity_search.xml
+++ b/app/src/leanback/res/layout/activity_search.xml
@@ -59,6 +59,7 @@
             android:id="@+id/keyword"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_alignEnd="@+id/keyboard"
             android:layout_marginBottom="16dp"
             android:layout_toEndOf="@+id/mic"
             android:background="@null"