diff --git a/app/src/main/java/com/gh/base/BaseRichEditorActivity.kt b/app/src/main/java/com/gh/base/BaseRichEditorActivity.kt
index 1e8246a236..bed7db08c3 100644
--- a/app/src/main/java/com/gh/base/BaseRichEditorActivity.kt
+++ b/app/src/main/java/com/gh/base/BaseRichEditorActivity.kt
@@ -182,7 +182,7 @@ abstract class BaseRichEditorActivity : BaseActivity() {
                 startActivityForResult(InsertArticleWrapperActivity.getIntent(this), INSERT_ARTICLE_CODE)
             }
             R.id.editor_link_game -> {
-                startActivityForResult(GameActivity.getIntent(this), INSERT_GAME_CODE)
+                startActivityForResult(GameActivity.getIntent(this, "插入游戏"), INSERT_GAME_CODE)
             }
             R.id.editor_link_video -> {
                 startActivityForResult(VideoActivity.getIntent(this), INSERT_VIDEO_CODE)
diff --git a/app/src/main/java/com/gh/common/util/EntranceUtils.java b/app/src/main/java/com/gh/common/util/EntranceUtils.java
index 0da58dd952..49492485ad 100644
--- a/app/src/main/java/com/gh/common/util/EntranceUtils.java
+++ b/app/src/main/java/com/gh/common/util/EntranceUtils.java
@@ -122,6 +122,7 @@ public class EntranceUtils {
     public static final String KEY_DIRECT_COMMENT = "directComment";
     public static final String KEY_SORT = "sort";
     public static final String KEY_COLLECTION_ID = "collectionId";
+    public static final String KEY_NAVIGATION_TITLE = "navigationTitle";
 
     public static void jumpActivity(Context context, Bundle bundle) {
 
diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/GameActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/GameActivity.kt
index 72f8de1f98..b7136f9cd7 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/editor/GameActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/editor/GameActivity.kt
@@ -12,6 +12,7 @@ import android.widget.EditText
 import android.widget.TextView
 import androidx.lifecycle.ViewModelProviders
 import com.gh.common.constant.Config
+import com.gh.common.util.EntranceUtils
 import com.gh.gamecenter.R
 import com.gh.gamecenter.baselist.ListActivity
 import com.gh.gamecenter.baselist.NormalListViewModel
@@ -55,7 +56,7 @@ class GameActivity : ListActivity<GameEntity, NormalListViewModel<GameEntity>>()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setNavigationTitle("插入游戏")
+        setNavigationTitle(intent?.getStringExtra(EntranceUtils.KEY_NAVIGATION_TITLE) ?: "插入游戏")
         noneText.text = "搜索结果为空"
         mListLoading.visibility = View.GONE
         mListRefresh.isEnabled = false
@@ -137,8 +138,10 @@ class GameActivity : ListActivity<GameEntity, NormalListViewModel<GameEntity>>()
     }
 
     companion object {
-        fun getIntent(context: Context): Intent {
-            return Intent(context, GameActivity::class.java)
+        fun getIntent(context: Context, title: String): Intent {
+            val intent = Intent(context, GameActivity::class.java)
+            intent.putExtra(EntranceUtils.KEY_NAVIGATION_TITLE, title)
+            return intent
         }
     }
 }
diff --git a/app/src/main/java/com/gh/gamecenter/video/upload/view/UploadVideoActivity.kt b/app/src/main/java/com/gh/gamecenter/video/upload/view/UploadVideoActivity.kt
index 463faa76df..6aaf8fa79d 100644
--- a/app/src/main/java/com/gh/gamecenter/video/upload/view/UploadVideoActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/video/upload/view/UploadVideoActivity.kt
@@ -86,7 +86,7 @@ class UploadVideoActivity : BaseActivity() {
             mBinding.titleCounter.text = (s.length.toString() + "/100")
         })
         mBinding.gameName.setOnClickListener {
-            startActivityForResult(GameActivity.getIntent(this), REQUEST_GAME_CODE)
+            startActivityForResult(GameActivity.getIntent(this, "选择游戏"), REQUEST_GAME_CODE)
         }
         mBinding.postButton.setOnClickListener {
             verifyData(false)
@@ -169,6 +169,7 @@ class UploadVideoActivity : BaseActivity() {
                 mBinding.gameName.setTextColor(resources.getColor(R.color.text_333333))
             }
             mBinding.gameTitle.setText(videoDraft.title)
+            mBinding.gameTitle.setSelection(mBinding.gameTitle.text.toString().length)
             initUpload(videoDraft.localPath)
         } else {
             initUpload(intent.getStringExtra(EntranceUtils.KEY_PATH_VIDEO))