diff --git a/frontend/src/pages/wiki2/index.js b/frontend/src/pages/wiki2/index.js
index 21aaa3adf56..3f190508de2 100644
--- a/frontend/src/pages/wiki2/index.js
+++ b/frontend/src/pages/wiki2/index.js
@@ -151,7 +151,7 @@ class Wiki extends Component {
       let errorMsg = Utils.getErrorMsg(error);
       toaster.danger(errorMsg);
     });
-  }, 1000);
+  }, 500);
 
   saveWikiConfig = (wikiConfig, isUpdateBySide = false) => {
     this.setState({
diff --git a/frontend/src/pages/wiki2/utils/index.js b/frontend/src/pages/wiki2/utils/index.js
index 761dc3d083d..57ac3f71837 100644
--- a/frontend/src/pages/wiki2/utils/index.js
+++ b/frontend/src/pages/wiki2/utils/index.js
@@ -53,20 +53,32 @@ const getWikPageLink = (pageId) => {
   return `${origin}${pathname}?page_id=${pageId}`;
 };
 
-const throttle = (fn, delay) => {
-  let timer;
-  return function () {
-    let _this = this;
-    let args = arguments;
-    if (timer) {
-      return;
+function throttle(func, delay) {
+  let lastCall = 0;
+  let timeoutId = null;
+  let lastArgs = null;
+
+  return function (...args) {
+    const now = new Date().getTime();
+    lastArgs = args;
+
+    if (now - lastCall >= delay) {
+      if (timeoutId) {
+        clearTimeout(timeoutId);
+        timeoutId = null;
+      }
+      lastCall = now;
+      func(...args);
+    } else if (!timeoutId) {
+      timeoutId = setTimeout(() => {
+        lastCall = new Date().getTime();
+        timeoutId = null;
+        func(...lastArgs);
+      }, delay - (now - lastCall));
     }
-    timer = setTimeout(function () {
-      fn.apply(_this, args);
-      timer = null;
-    }, delay);
   };
-};
+}
+
 
 // Find the path array from the root to the leaf based on the currentPageId (leaf)
 const getPaths = (navigation, currentPageId, pages, isGetPathStr) => {
diff --git a/frontend/src/pages/wiki2/wiki-right-header/page-title-editor.js b/frontend/src/pages/wiki2/wiki-right-header/page-title-editor.js
index bb604049c39..e7b0c4686ad 100644
--- a/frontend/src/pages/wiki2/wiki-right-header/page-title-editor.js
+++ b/frontend/src/pages/wiki2/wiki-right-header/page-title-editor.js
@@ -30,11 +30,15 @@ function PageTitleEditor({ isUpdateBySide, currentPageConfig, onUpdatePage }) {
       range.setStart(startContainer, startOffset);
       range.setEnd(endContainer, endOffset);
 
+      range.selectNodeContents(contentEditableRef.current);
+      range.collapse(false);
+
       const selection = window.getSelection();
       selection.removeAllRanges();
       selection.addRange(range);
+      contentEditableRef.current.focus();
     }
-  }, [pageName.length]);
+  }, [pageName]);
 
   const onKeyDown = (event) => {
     if (event.keyCode === 13) {