diff --git a/wax-prosemirror-components/src/components/EditorInfo/EditorShortCutsTool.js b/wax-prosemirror-components/src/components/EditorInfo/EditorShortCutsTool.js
index f163ed26e12275f25c582fe99685a97d12f35bc4..37703d25f5fdbfcdedeaea0b40ace7d493b4032d 100644
--- a/wax-prosemirror-components/src/components/EditorInfo/EditorShortCutsTool.js
+++ b/wax-prosemirror-components/src/components/EditorInfo/EditorShortCutsTool.js
@@ -49,7 +49,28 @@ const CounterInfoComponent = styled.div`
   display: flex;
   flex-direction: column;
   position: fixed;
-  right: 31px;
+  right: 136px;
+`;
+
+const ShortCutsContainer = styled.div`
+  font-size: 14px;
+  height: 240px;
+  padding: 4px;
+  width: 200px;
+`;
+
+const ShortCutsList = styled.ul`
+  list-style-type: none;
+  margin: 0;
+  padding: 0;
+
+  li {
+    padding-bottom: 6px;
+
+    span {
+      color: #535e76;
+    }
+  }
 `;
 
 const EditorShortCutsTool = ({ view: { state }, item }) => {
@@ -65,7 +86,40 @@ const EditorShortCutsTool = ({ view: { state }, item }) => {
   useOnClickOutside(ref, () => setIsOpen(false));
 
   const renderList = () => {
-    return <span>hii</span>;
+    return (
+      <ShortCutsContainer>
+        <ShortCutsList>
+          <li>
+            <span>Ctrl + s </span> : Save
+          </li>
+          <li>
+            <span>Ctrl + z </span> : Undo
+          </li>
+          <li>
+            <span>Ctrl + Shift + z </span> : Redo
+          </li>
+
+          <li>
+            <span>Shift+Ctrl+8 </span> : Bullet List
+          </li>
+          <li>
+            <span>Shift+Ctrl+9 </span> : Ordered List
+          </li>
+          <li>
+            <span>Ctrl-] </span> : Indent list item
+          </li>
+          <li>
+            <span>Ctrl-[ </span> : Lift list item
+          </li>
+          <li>
+            <span>Ctrl or Shift + Enter </span> : Soft break
+          </li>
+          <li>
+            <span>Ctrl + f </span> : Search and replace
+          </li>
+        </ShortCutsList>
+      </ShortCutsContainer>
+    );
   };
 
   const MenuButtonComponent = useMemo(
diff --git a/wax-prosemirror-components/src/components/findAndReplace/FindAndReplaceTool.js b/wax-prosemirror-components/src/components/findAndReplace/FindAndReplaceTool.js
index 0475fad67a66352a943aff4c279bea31c8361dc1..395bcb2c1f256ba83f2d87af9ba3c545078de641 100644
--- a/wax-prosemirror-components/src/components/findAndReplace/FindAndReplaceTool.js
+++ b/wax-prosemirror-components/src/components/findAndReplace/FindAndReplaceTool.js
@@ -4,6 +4,7 @@ import React, {
   useMemo,
   useState,
   useLayoutEffect,
+  useEffect,
 } from 'react';
 
 import styled from 'styled-components';
@@ -44,6 +45,21 @@ const FindAndReplaceTool = ({ view = {}, item }) => {
   });
   if (!isEditable) isDisabled = true;
 
+  const triggerFind = e => {
+    if ((e.key === 70 || e.keyCode === 70) && (e.metaKey || e.ctrlKey)) {
+      e.preventDefault();
+      setIsOpen(true);
+      return false;
+    }
+    return true;
+  };
+
+  useEffect(() => {
+    document.addEventListener('keydown', triggerFind);
+
+    return () => document.removeEventListener('keydown', triggerFind);
+  }, []);
+
   useLayoutEffect(() => {
     setStyle(styles);
     if (!dropElement.current) return;