diff --git a/digital-course-file/src/user/Folder.js b/digital-course-file/src/user/Folder.js
index 158487baacaf37358840045c5a860557d25b1acb..208fb21a4ee4bf1035793a927b3807bead589679 100644
--- a/digital-course-file/src/user/Folder.js
+++ b/digital-course-file/src/user/Folder.js
@@ -1,12 +1,10 @@
-import { React } from "react";
+import { React,useState,useEffect } from "react";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { faFolder } from "@fortawesome/free-solid-svg-icons"
 import { Button } from "react-bootstrap";
 import { Link } from "react-router-dom";
 import { useHistory } from "react-router-dom";
-
 import { useContextMenu, Menu, Item, Separator } from "react-contexify";
-
 import "react-contexify/dist/ReactContexify.css";
 
 export default function Folder ({folder}) {
@@ -18,14 +16,15 @@ export default function Folder ({folder}) {
       });
 
       function displayMenu(e) {
-        show(e, { props: { id: Number(e.currentTarget.id) } });
+        // e.preventDefault();
+        show(e, { props: { id: Number(e.currentTarget.id) , folderId : folder.id} });
       }
     
-      function handleItemClick({ event, props, data, triggerEvent }) {
-
+      function handleItemClick({ event, props, data, triggerEvent}) {
+        // console.log(props.folderId);
         switch (event.currentTarget.id) {
           case "open":
-            history.push(`/folder/${folder.id}`);
+            history.push(`/folder/${props.folderId}`);
             break;
 
           case "rename":
@@ -42,6 +41,7 @@ export default function Folder ({folder}) {
         <div>
         <Button 
             onContextMenu={displayMenu}
+            id={folder.id}
             to={`/folder/${folder.id}`} 
             variant="outline-secondary" 
             className="text-truncate w-100" 
@@ -51,20 +51,18 @@ export default function Folder ({folder}) {
         </Button>
 
         <Menu id={MENU_ID}>
-        <Item id="open" onClick={handleItemClick}>
-          Open
-        </Item>
-        <Item id="rename" onClick={handleItemClick}>
-          Rename
-        </Item>
-
-        <Item id="details" onClick={handleItemClick}>
-          Details
-        </Item>
-
-      </Menu>
+            <Item id="open" onClick={handleItemClick} >
+              Open
+            </Item>
+            <Item id="rename" onClick={handleItemClick}>
+              Rename
+            </Item>
+            <Item id="details" onClick={handleItemClick}>
+              Details
+            </Item>
+        </Menu>
 
         </div>
     );
 
-}
\ No newline at end of file
+}