diff --git a/packages/client/src/components/GlobalEvents/RenameEvent.js b/packages/client/src/components/GlobalEvents/RenameEvent.js
index d9efdae0b8..f7096226cc 100644
--- a/packages/client/src/components/GlobalEvents/RenameEvent.js
+++ b/packages/client/src/components/GlobalEvents/RenameEvent.js
@@ -22,6 +22,8 @@ const RenameEvent = ({
   editCompleteAction,
   clearActiveOperations,
 
+  updateCurrentFolder,
+
   setEventDialogVisible,
   eventDialogVisible,
 }) => {
@@ -100,6 +102,8 @@ const RenameEvent = ({
             timerId = null;
             clearActiveOperations(null, [item.id]);
 
+            updateCurrentFolder(null, [item.id]);
+
             setIsLoading(false);
             onClose();
           });
@@ -134,7 +138,7 @@ export default inject(
       renameFolder,
     } = filesStore;
 
-    const { editCompleteAction } = filesActionsStore;
+    const { editCompleteAction, updateCurrentFolder } = filesActionsStore;
 
     const { clearActiveOperations } = uploadDataStore;
     const { setEventDialogVisible, eventDialogVisible } = dialogsStore;
@@ -146,6 +150,7 @@ export default inject(
       renameFolder,
 
       editCompleteAction,
+      updateCurrentFolder,
 
       clearActiveOperations,
       setEventDialogVisible,
diff --git a/packages/client/src/pages/Home/Section/Header/index.js b/packages/client/src/pages/Home/Section/Header/index.js
index ca6a1d8ce3..04b588bd10 100644
--- a/packages/client/src/pages/Home/Section/Header/index.js
+++ b/packages/client/src/pages/Home/Section/Header/index.js
@@ -236,7 +236,16 @@ class SectionHeaderContent extends React.Component {
       .catch((err) => toastr.error(err));
   };
 
-  renameAction = () => console.log("renameAction click");
+  renameAction = () => {
+    const { selectedFolder } = this.props;
+
+    const event = new Event(Events.RENAME);
+
+    event.item = selectedFolder;
+
+    window.dispatchEvent(event);
+  };
+
   onOpenSharingPanel = () => {
     this.props.setBufferSelection(this.props.currentFolderId);
     this.props.setIsFolderActions(true);
@@ -442,6 +451,11 @@ class SectionHeaderContent extends React.Component {
         disabled: isRecycleBinFolder || isRoom,
         icon: "images/rename.react.svg",
       },
+      {
+        key: "separator-3",
+        isSeparator: true,
+        disabled: isRecycleBinFolder || isRoom,
+      },
       {
         key: "delete",
         label: t("Common:Delete"),