diff --git a/wax-prosemirror-components/src/components/findAndReplace/FindComponent.js b/wax-prosemirror-components/src/components/findAndReplace/FindComponent.js
index bb5ecc8c5335ef344a00e34f92597810e74a56bc..902b9f64156011c1e577cf092796811e0d388e68 100644
--- a/wax-prosemirror-components/src/components/findAndReplace/FindComponent.js
+++ b/wax-prosemirror-components/src/components/findAndReplace/FindComponent.js
@@ -84,6 +84,7 @@ const FindComponent = ({ close, expand, setPreviousSearcValue }) => {
   const [searchValue, setSearchValue] = useState('');
   const [counterText, setCounterText] = useState('0 of 0');
   const findAndReplacePlugin = app.PmPlugins.get('findAndReplacePlugin');
+  const [isFirstRun, setFirstRun] = useState(true);
   const allStates = [];
 
   each(view, (singleView, viewId) => {
@@ -101,6 +102,12 @@ const FindComponent = ({ close, expand, setPreviousSearcValue }) => {
 
   useEffect(() => {
     delayedSearch();
+    if (isFirstRun) {
+      setTimeout(() => {
+        searchRef.current.focus();
+        setFirstRun(false);
+      });
+    }
   }, [searchValue, delayedSearch, JSON.stringify(allStates)]);
 
   const searchDocument = () => {
diff --git a/wax-prosemirror-services/src/WaxToolGroups/DisplayTextToolGroupService/DisplayText.js b/wax-prosemirror-services/src/WaxToolGroups/DisplayTextToolGroupService/DisplayText.js
index 5618610d150a93470f297d9569758823dec536f2..0ad922f8c9cf261aed1c0b1ef3694a3d45c6afbc 100644
--- a/wax-prosemirror-services/src/WaxToolGroups/DisplayTextToolGroupService/DisplayText.js
+++ b/wax-prosemirror-services/src/WaxToolGroups/DisplayTextToolGroupService/DisplayText.js
@@ -51,11 +51,11 @@ class DisplayText extends ToolGroup {
 
     const tabList = [first, second];
 
-    // const TabsComponent = useMemo(
-    //   () => <Tabs key={uuidv4()} tabList={tabList} />,
-    //   [],
-    // );
-    return <Tabs key={uuidv4()} tabList={tabList} />;
+    const TabsComponent = useMemo(
+      () => <Tabs key={uuidv4()} tabList={tabList} />,
+      [],
+    );
+    return TabsComponent;
   }
 }