diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/adapter/KeyboardAdapter.java b/app/src/leanback/java/com/fongmi/android/tv/ui/adapter/KeyboardAdapter.java
index 14fe4a904..38e92983b 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/adapter/KeyboardAdapter.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/adapter/KeyboardAdapter.java
@@ -20,7 +20,7 @@ public class KeyboardAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
     private final List<Object> mItems;
 
     public KeyboardAdapter(OnClickListener listener) {
-        this.mItems = Arrays.asList("1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", R.drawable.ic_keyboard_left, R.drawable.ic_keyboard_right, R.drawable.ic_keyboard_back, R.drawable.ic_keyboard_enter);
+        this.mItems = Arrays.asList("1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", R.drawable.ic_keyboard_space, R.drawable.ic_keyboard_left, R.drawable.ic_keyboard_right, R.drawable.ic_keyboard_back);
         this.mListener = listener;
     }
 
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 85d6fbe96..535178c49 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
@@ -40,8 +40,10 @@ public class CustomKeyboard implements KeyboardAdapter.OnClickListener {
         StringBuilder sb = new StringBuilder(binding.keyword.getText().toString());
         int cursor = binding.keyword.getSelectionStart();
         switch (resId) {
-            case R.drawable.ic_keyboard_enter:
-                binding.search.performClick();
+            case R.drawable.ic_keyboard_space:
+                sb.insert(cursor, " ");
+                binding.keyword.setText(sb.toString());
+                binding.keyword.setSelection(cursor + 1);
                 break;
             case R.drawable.ic_keyboard_left:
                 binding.keyword.setSelection(--cursor < 0 ? 0 : cursor);
diff --git a/app/src/leanback/res/drawable/ic_keyboard_enter.xml b/app/src/leanback/res/drawable/ic_keyboard_enter.xml
deleted file mode 100644
index 0d0ebe8cc..000000000
--- a/app/src/leanback/res/drawable/ic_keyboard_enter.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="48dp"
-    android:height="48dp"
-    android:tint="@color/white"
-    android:viewportWidth="48"
-    android:viewportHeight="48">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M18,36 L6.05,24.05 18,12.1l2.15,2.15 -8.35,8.35H39V14h3v11.55H11.85l8.3,8.3Z" />
-</vector>
diff --git a/app/src/leanback/res/drawable/ic_keyboard_space.xml b/app/src/leanback/res/drawable/ic_keyboard_space.xml
new file mode 100644
index 000000000..85b4bb262
--- /dev/null
+++ b/app/src/leanback/res/drawable/ic_keyboard_space.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M18,9v4H6V9H4v6h16V9z"/>
+</vector>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index dd213d10c..582e3e476 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -62,8 +62,9 @@
     <string name="error_play_next">已经是最后一集了！</string>
     <string name="error_play_prev">已经是第一集了！</string>
     <string name="error_play_parse">播放地址解析失败</string>
-    <string name="error_play_load">播放信息加载失败</string>
+    <string name="error_play_load">播放数据加载失败</string>
     <string name="error_play_format">不支援的影片格式</string>
+    <string name="error_episode">暂无播放数据</string>
     <string name="error_empty">找不到数据</string>
 
     <!-- UNIT -->
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 09b06109e..1741351b3 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -64,6 +64,7 @@
     <string name="error_play_parse">播放網址解析失敗</string>
     <string name="error_play_load">播放資料載入失敗</string>
     <string name="error_play_format">不支援的影片格式</string>
+    <string name="error_episode">暫無播放資料</string>
     <string name="error_empty">找不到資料</string>
 
     <!-- UNIT -->
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 975d00ba8..d4ffa81f6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -64,6 +64,7 @@
     <string name="error_play_parse">Unable to parse url</string>
     <string name="error_play_load">Unable to load url</string>
     <string name="error_play_format">Unsupported video format</string>
+    <string name="error_episode">No episode data</string>
     <string name="error_empty">Not found</string>
 
     <!-- UNIT -->